Gazebo merge to devel

we need to tag the development branch before we merge this but putting it up for review now.