Fix typo in comment
Add function to set expiration time (24 hours) for email token
Modify tests to account for expiration of email tokens
Primary change: set up an expired token for a user in test_verify_confirmation_token,
confirmed that it returned false.

Several other functions had to be modified, because the email_verifications[token]
dict now has 2 elements, not 1.
Update comment to reflect changed dict object for email_verifications
Merge branch 'develop' of github.com:CenterForOpenScience/osf.io into feature/expire-email-token
Fix a flake8 error, remove assignment to variable
Fix an off by one error
Handle text overflow of email tooltip in navbar

Closes #1347
Change site.css and search.mako to align social icons
Update migration log
Merge branch 'master' into develop
Merge branch 'feature/issue1347' into develop

Conflicts:
	website/static/css/site.css
Merge branch 'develop' into csheldonhess-feature/expire-email-token

Conflicts:
	framework/auth/core.py
Rename and change signature of set_email_token_expiration
verify_confirmation_token always returns a boolean
Merge branch 'feature/expire-email-token' into develop
Fix incorrect test
Merge branch 'develop' into csheldonhess-feature/align-social-icons
Merge branch 'feature/align-social-icons' into develop
Merge branch 'develop' of github.com:CenterForOpenScience/osf.io into feature/comment-pane