Clean up and Improvements

Fixed up a few things and added new toolbars.
Merge branch 'master' of https://github.com/RobertBColton/OpenStudio