cleaning up login
Merge branch 'master' of https://github.com/bmaple/bur2
merge stuff
Merge branch 'master' of https://github.com/bmaple/bur2