Don't worry about the next conversation for archived ones
Group together controller actions for the spec
Don't create orphaned person records when updating
Merge pull request #159 from vanstee/change-email-not-user

Don't create orphaned person records when updating
Merge pull request #158 from vanstee/fix-show-archived-conversation

Fix show archived conversation
Fix incorrect params in user edit test