Generated Sorcery mailer and wrote code for reset password email
User mailer method tested and passing
Merge branch 'master' into reset_password

Conflicts:
	spec/models/user_spec.rb
User Mailer tested and passing with edits to `config/application.rb`
Further work on `user_resets_password_spec.rb`
email successfully sends
User reset password feature complete
merged master
removed duplicate pry-rails gem in Gemfile
removed hammering protection, added user email to email text
merged master
Fixed all code from last commit where @elizabrock made comments.
Merge branch 'master' into reset_password

* master:
  Revert "Implemented. Reworking"
  Implemented. Reworking
  admin can toggle user admin privileges
  Bumpe gems.
  Attempt to get webkit working on Travis.
  Integration tests for view-plant-varieties passing * Switched from capybara/webkit to poltergeist
  working on admin
  conflict with changing_email branch
  merge before sync with master add ajax to view varieties add dropdown to view categories
  undo poltergeist include
  added specs for viewing plant varieties, pending implementation

Conflicts:
	Gemfile
	config/routes.rb
Merge branch 'reset_password'

* reset_password:
  Fixed all code from last commit where @elizabrock made comments.
  removed hammering protection, added user email to email text
  removed duplicate pry-rails gem in Gemfile
  User reset password feature complete
  email successfully sends
  Further work on `user_resets_password_spec.rb`
  User Mailer tested and passing with edits to `config/application.rb`
  User mailer method tested and passing
  Generated Sorcery mailer and wrote code for reset password email

Conflicts:
	Gemfile.lock