* Creating addemail_controller, addemail_controller_unit_tests, and addemail.ejs.
* Shrink down pickemail_controller, and pickemail.ejs.
* Update a lot of the pickemail_controller unit tests to be more complete.
* Account consolidation is again possible.

close #607
close #612