major merge of features from the hosted branch that was created temporarily during the initial launch of jambonz.org
Dave Horton