Added for heroku
Changed filename and pep8'ed stuff