MJ-757 link user accounts

Ok, this pull request only includes the view and tests for merging an account, without the changes to the email language.  I want to get this into master, so I can start working on updates to the email language without having the PR get out of control.