Cmi with catkin make args

@wjwwood Please review and merge.