catkinized with 51b5b6fc87b9a42ac08fca10bd581d52d159d1ee
tweaks to get compiling with catkin