Updated the main driver to use catkin
Merge branch 'master' of https://github.com/allenh1/p2os
Updated p2os_launch for catkin