pull peter's stuff
Merge branch 'master' of https://github.com/gkahn13/pr2_eih_ros