merging the modifications from dave's plugin into ros_control_gazebo_plugin