Merge pull request #5 from davetcoleman/development

Gazebo and ros_control URDF Tags
Merge pull request #6 from davetcoleman/torso_screen_launch_update

Torso-screen-launch update
Merge branch 'development' into baxter_with_gripper