modify to pass catkin_make, change remained old package name to new one
Merge pull request #296 from tnaka/catkin-fix-and-pkg-name-fix

modify to pass catkin_make, change remained old package name to new one