Minor cleanup.
Issue#6: Added Mockito as a dependency
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Consolidated email normalization to a central util class.