Updating catkin makefile to (hopefully) work with changes from last commit - untested