roslaunch: increase the start and stop timeouts for the ROS master (resolves #215)
Merge pull request #216 from esteve/increase-ros-master-timeouts-215

roslaunch: increase the start and stop timeouts for the ROS master (resolves #215)