Some user update
Merge branch 'meveridge' of https://github.com/meveridge/douglas into propane
Merge branch 'propane' of https://github.com/TheJaySmith/douglas into TheJaySmith-propane

Merging login changes.
Merge branch 'TheJaySmith-propane'

Merging in login changes
Merge remote-tracking branch 'upstream/master'
Merge upstream...