Cleaning up some stuff
Merge branch 'master' of heroku.com:jobhunt