Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper