tweaks for catkinize
catkinized with 2c3cd64036c75b2d9d8d0d65ee13a398be5c33a3
tweaks to get compiling with catkin