Changing some item stuff
Changing homepage titles
Correctly disabling the reset button initially and removing some variables that are duplicates of other variables
Clean up email address validation.
Merge remote-tracking branch 'upstream/master' into jp751
Merge pull request #856 from nickavv/parachute

A bunch of stuff
Fixed a table bug I introduced in a previous PR
Merge remote-tracking branch 'upstream/master' into jp751
Merge pull request #867 from jaypoulz/jp751

Zoom should now resize appropriately when not locked by the user.
undoing accidental changes
Merge pull request #860 from jdalphon/changeItems

Change items
Add password reset functionality.
Make email message better.
Allow user email changes.
Merge pull request #869 from NatTuck/password-resets

Password resets
-Almost finished with the new parser - must finish hooking it up into validating and vis.
Revert "Allow user email changes."

This reverts commit 0c532f7330c8f1c37ea25118fbef03d6679d2ea7.
Revert "Make email message better."

This reverts commit 9dda5d1d5621d38ca6a2f661983bbe89016d9b15.
Revert "Add password reset functionality."

This reverts commit 2c8b39b2afbd4acc9daa7247a5f0b3dc531fd006.
Revert "Clean up email address validation."

This reverts commit 087544834005dcafd2ae0eba1dd77eca7438c2f8.