pep8
more
Merge branch 'thatasshole' of https://github.com/fly/pugbot-ng into fly-thatasshole

Conflicts:
	pugbot-ng.py
Merge branch 'fly-thatasshole'