committing changes I'd forgotten to
Merge branch 'master' of github.com:oisinmulvihill/evasion-messenger

Conflicts:
	setup.py