Heroku is no longer a todo (and fix indents)
Merge branch 'master' of https://github.com/SeanTater/watson