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
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
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
Integration tests for view-plant-varieties passing
* Switched from capybara/webkit to poltergeist
Merge branch 'master' into view-plant-varieties

* master: (25 commits)
  Explicitly create the database for travis.
  Add wireframes pdf
  Refactor garden rendering.
  Add `bundle exec` to travis rake commands
  Add schema load to travis setup.
  Setup Travis and CodeClimate
  added changes to edit function resolves issue #18
  added request updates resolves issue #18
  added request updates resolves issue #18
  Clean up change email spec, adds db.yml.example
  Switch to using @gardens on gardens#index
  resolves issue #18
  added suggested changes
  Merged profile_cont w/ user_cont.Fully implemented
  corrected tables in garden/index and edit haml files
  Clean up plant variety workflow.
  created garden plot thumbnails for garden index plot layout for garden edit
  Implemented. Pending reworking into user model
  redirect non logged in user to signin page when trying to access another user's garden edit page is now working
  edit working
  ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/gardens_controller.rb
	app/controllers/varieties_controller.rb
	config/routes.rb
Merge branch 'view-plant-varieties'

* view-plant-varieties:
  Integration tests for view-plant-varieties passing * Switched from capybara/webkit to poltergeist
  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