updated login to check for bad email address 4/19/14. lmk
Merge origin/master