Fixed up some specs
Merge branch 'master' into test-fix

* master:
  Incorporated and fixed issues reported by rubocop. Configurations reside in '.rubocop.yml'

Conflicts:
	spec/models/event_spec.rb
	spec/requests/users_spec.rb
Merge pull request #765 from 24pullrequests/test-fix

Test fix