Revert to pre heroku times
Merge branch 'master' of https://github.com/grassdog/mwiki