Fixes roscpp_core with indigo branch, adds cv_bridge.