Clean up UsersController#index tests in the users_controller_spec
Fix admin check in Users#index and remove unneeded comments in users_controller
Remove unneeded warden stub from users_controller_spec
Fix wording in one spec in users_controller_spec.rb
merging in latest develop stuff with Daniel's refcatoring of users controller and spec