changes?
Merge branch 'master' of https://github.com/AmandaSutherland/ERRbot

Conflicts:
	errbot/ERRbotVision.py