A few updates to the catkin build rules.  Allows package to be built in one call
to catkin_make