etskelly/holiday_machine — pull request #87 by patricklindsay (2014-07-15 13:30:41+00:00)
Title: Allows users to edit settings without providing password

Previously a user could not update there settings without providing there password. Now they only need to provide a password when updating email field or setting a new password.
Also cleaned up the sample data to maker it a bit DRYer.