Email conf github bug

The amount of red in the diff is a bit misleading.  No tests were deleted in the hunting of this bug.  Several were added, and many were refactored.  

I also revised the method in the users controller to redirect people back to the page they were on when they clicked the link to have email confirmation instructions sent again, and there are corresponding tests for that.