Added gazebo_ros_pkgs to build farm
Reordered files
merged conflict
Merge pull request #1027 from davetcoleman/master

Adding gazebo_ros_pkgs to build farm