Indigo devel

Added compatibility with ROS Indigo and added new functionality to the collision map class. All changes build successfully in both ROS Hydro and ROS Indigo, so maintaining separate branches is unnecessary.