Refactored User.get_email_owner to use one query instead of two.
Catching a bug that wouldn't check secondary emails.
Adding code to merge user accounts.
Fixed a typo in a template
Hiding the extraneous logging statements that clutter the testapps
command.
Added a merge account view that combines user details

 - Merges Contacts
 - Merges SavedSearches
 - Adds a secondaryEmail
 - deletes unnecessary account.
Updated the activation template to include a link to with an existing
account.
Setting the secondary email to verified, per Troy's suggestion.
Fixing pep8 issues.
Pep8 formatting
Handle bounces from redirected emails [RD-84]
Merge branch 'master' into email-redirect-issue-handling
Fix jira logging issue [RD-84]
Merge branch 'master' into email-redirect-issue-handling
Remove some wildcard imports [RD-84]
Add tests for email redirect failure [RD-84]
Merge branch 'master' into email-redirect-issue-handling
Merge branch 'master' into email-redirect-issue-handling

Conflicts:
	myjobs/helpers.py
Merge branch 'master' into MJ-757-Link-User-Accounts
Removing changes to email language.