Email aliases

add functionality for users to have multiple email addresses
Use the new Ruby 1.9 hash syntax.<br>Inconsistent indentation detected.