Merge the heroku branch into our master branch

This is the code that's currently running on Heroku. It works locally on my machine and seems to be working there too. Once we merge this to master we can build on it in the next sprint.

Sean