Merge in updates from opensim github repo

merge in a number of updates from opensim github repo