pyflakes and pep8 cleanup

Signed-off-by: Daniel Farina <daniel@heroku.com>