Revert "Revert "Clean up email address validation.""

This reverts commit 9390899cc49819b5401ebd99b28509174c23b4b6.
Revert "Revert "Add password reset functionality.""

This reverts commit 1eae7f7d6eea5c3b01938f3d9bb313e583d37706.
Revert "Revert "Make email message better.""

This reverts commit 0a1fe5915259fcab3de42a74a8c32492f83db3f7.
Revert "Revert "Allow user email changes.""

This reverts commit 990fa0567b693e454da35847bcd5dd19e58b618b.
Merge branch 'password-resets' of github.com:NatTuck/rSENSE into password-resets

Conflicts:
	app/controllers/users_controller.rb