Logging in should now default to username from prefs to login
Merge remote-tracking branch 'upstream/master' into jp636
Cleaned logs and testing login stuffs
Removed more logs and cleaned Mike's pr
Merge pull request #642 from jaypoulz/jp636

Jp636 -- Removing the extra logs and some login mods