Merge pull request #183 from eventh/pep8-fixes

Fixed pep8 errors
Merge branch 'master' into heroku-memcache