Danny had some input, so I tried to implement it

It still needs some cleanup, but it's ten million
times better than what's deployed to heroku now.
Merge branch 'danny-style' into for-heroku
Merge branch 'for-heroku' of github.com:freshvolk/north-american-octo-wight into for-heroku