Adding merged gazebo_ros_control and ros_control gazebo to gazebo_ros_pkgs

See gazebo_ros_control PR here for more info: https://github.com/osrf/gazebo_ros_control/pull/1