Merge pull request #1 from dillongrove/master

Heroku Fixes
Merge pull request #2 from dillongrove/master

Have the server not completely crash when tying to visit /