Back to work
Merge branch 'master' of https://github.com/joshf/Burden into multi-user