travis config: Fixing ros bootstrap checkout url
Merge branch 'gmaster' into catkin