catkinized with f95814aecd6c9dc5e1a0e318948796bc249512a4
tweaks to get compiling with catkin