cleanup
Merge branch 'master' of github.com:nirrius/kvetch.io