Merged in from Heroku branch. I'm a bad boy for waiting so long. :c
merging