Totally forgot to commit this for a really long time
Merge branch 'master' of github.com:SaneApp/webmachine