Merge branch 'pep8'

Conflicts:
	generators/haproxy.py
Mo' mergin'.