Bring the opensim repo up to date with the opensim repo at opensimulator.org as of August 22, 2014