Remove old line break and comments
Remove code that borked login
Merge branch 'master' of https://github.com/joshf/Burden into multi-user