Added link against catkin_LIBRARIES for tf2_ros lib

Also CMakeLists.txt clean up.