added specs for viewing plant varieties, pending implementation
undo poltergeist include
Merge remote-tracking branch 'remotes/origin/master' into view-plant-varieties
Merge remote-tracking branch 'remotes/origin/master' into view-plant-varieties
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`
merge before sync with master
add ajax to view varieties
add dropdown to view categories
Merge branch 'view-plant-varieties' of https://github.com/elizabrock/greenthumb into view-plant-varieties
Further work on `user_resets_password_spec.rb`
Merge remote-tracking branch 'remotes/origin/master' into view-plant-varieties

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/controllers/varieties_controller.rb
	app/views/gardens/edit.html.haml
	config/routes.rb
email successfully sends
conflict with changing_email branch
User reset password feature complete
merged master
removed duplicate pry-rails gem in Gemfile
Explicitly create the database for travis.
removed hammering protection, added user email to email text
merged master