conflict with changing_email branch
working on admin
admin can toggle user admin privileges
Merge branch 'master' into user_admin_rights

* master: (45 commits)
  Revert "Implemented. Reworking"
  Implemented. Reworking
  Bumpe gems.
  Attempt to get webkit working on Travis.
  Integration tests for view-plant-varieties passing * Switched from capybara/webkit to poltergeist
  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
  ...

Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
Merge branch 'user_admin_rights'

* user_admin_rights:
  admin can toggle user admin privileges
  working on admin
  conflict with changing_email branch