Adds email confirmation to new account creation.
Adds ability to edit email with confirmation.
Merge pull request #11 from alienfungi/email_edit

Add ability to edit email
Adds password recovery to the login page via a link and modal.
Merge pull request #10 from alienfungi/password_recovery

Add password recovery
Allows recipient to be specified by email or username, causes form to repopulate if it fails to send, and fixes a bug that prevented sending from the new page.
Merge pull request #4 from alienfungi/message_recipient

Easier message recipient entry
Hides unconfirmed users and purges them if not confirmed in 7 days.
Merge pull request #12 from alienfungi/nonactive_users

Nonactivated users should be nonactive.
Removes login button from navbar.
Implements simple_form gem and ensures field highlighting for invalid fields
Merge pull request #13 from alienfungi/simple_form

Implement simple_form gem
Adds read/unread status to messages and notification badges to messages and friend requests.
Merge pull request #15 from alienfungi/unread_messages

Display whether a message is read.
Adds routes directly to tabs, clears flash messages on tab change, fixes messaging bugs, removes new message page, removes more legacy code from personal site.
Makes tests pass and adds some tests for application_helper.
Merge pull request #17 from alienfungi/test_branch

Fix tests.
Merge branch 'master' of https://github.com/alienfungi/my_page into add-posts

* 'master' of https://github.com/alienfungi/my_page:
  Makes tests pass and adds some tests for application_helper.
  Adds routes directly to tabs, clears flash messages on tab change, fixes messaging bugs, removes new message page, removes more legacy code from personal site.
  Adds read/unread status to messages and notification badges to messages and friend requests.
  Implements simple_form gem and ensures field highlighting for invalid fields
  Removes login button from navbar.
  Hides unconfirmed users and purges them if not confirmed in 7 days.
  Allows recipient to be specified by email or username, causes form to repopulate if it fails to send, and fixes a bug that prevented sending from the new page.
  Adds password recovery to the login page via a link and modal.
  Adds ability to edit email with confirmation.
  Adds email confirmation to new account creation.

Conflicts:
	Gemfile.lock
	app/controllers/application_controller.rb
	app/views/users/edit.html.haml
	config/routes.rb