pep8 *.py --ignore=E202,E501,E201,E226,E127,E127,E128,E126,E401
BE CAREFUL
Merge branch 'master' of github.com:ZuluPro/ZuluBot

Conflicts:
	zulubot/settings_local.py