Cleaned up CMake and removed unnecessary dependencies

Very simple cleanup per ROS standards and catkin_lint. This PR is for the indigo branch.