Removing some code I had added for debugging.
Removing some code I had added for debugging.

Conflicts:
	mapviz_plugins/CMakeLists.txt

swri-robotics/mapviz,jatowler/mapviz,swri-robotics/mapviz,jatowler/mapviz