Fix 62 pep8 errors

We should all run 'tox -e pep8' before pushing.
Merge branch 'markmc-fix-rack-update' into HEAD

Conflicts:
	tuskar/api/controllers/v1.py