Merge branch 'master' into develop

Conflicts:
	src/mjbot/parse.clj
smh @ conflicts