fixed linking flags and catkinized
Merge pull request #1 from gaya-/master

CATKINIZED: move me into the catkin workspace.