fixed error when .m
Merge branch 'master' of github.com:sc0tt/phenny

Conflicts:
	modules/mapimages.py
antijoke module