-Add the latest code with all of Aaron's changes, and some of mine.
Merge branch 'master' of https://github.com/SineadOSullivan/gazebo