Listener fix topic names
Merge branch 'ROS-encoder' of https://github.com/breznak/nupic into ROS-encoder

Conflicts:
	py/nupic/encoders/extras/ros.py