Email aliases

add functionality for users to have multiple email addresses
Line is too long. [125/80]<br>Use the new Ruby 1.9 hash syntax.<br>Inconsistent indentation detected.