Added User#token_expired?

This will help the readability of controller methods such as
confirm_email where we need to check the token age.

Also moved the perishable_token_set key up underneath perishable_token
since they 'belong' together.

Finally, I added perishable_token_set = nil to the
reset_perishable_token method since it should probably handle that.
Modified UsersController to make use of token_expired?

Also added some documentation to the confirm_email method and made it
start checking token age which previously wasn't being done.
Fixed/Added user unit and acceptance tests.

I fixed the tests to matchup with the new wording on confirm_email when
your token is expired. I added a 'resets the token' unit test.

Also added to_time in models/user.rb, it was left off in commit
3cea38ad.
Removed extra perishable_token_set key
Small tweak to email_change_test
Fixed users_controller to check for bad token
Added test to check expired token for email confirm
lolsymbol
add tests for deleting updates, closes #501
Merge pull request #502 from nashby/fix-issue-501

add tests for deleting updates, closes #501
refactor controllers
refactor email_change_test to use css selector
Merge remote-tracking branch 'caleywoods/user_improvements'
Merge remote-tracking branch 'nashby/refactor'

Conflicts:
	app/models/user.rb
Naming some routes; making all the redirects use route helpers consistently
Adding airbrake, not through heroku, since the developer plan not through heroku is free, configured with an environment variable
Refactor the image replacement into a method since we have to do it in two places
Move the timeago plugin call and make in a function similar to that for replacing broken images; call it when the pjax is done
Asset compilation
Ugh, another set of sporadically-failing-on-travis tests. Finding the delete link 'I regret this' failed in build #129 and build #135.