Fixed email bug and tightened up some stuff
Merge pull request #34 from ucberkeley/bugFixes

Fixed email bug and tightened up some stuff