remove ruby version from repo
update sass to resolve environment error
update bcrypt and will paginate gems to resolve errors
update default scoping to rails 4 standards
update feed method to look cleaner
Merge branch 'feature/rails-4.1-fixes' into develop

* feature/rails-4.1-fixes:
  update feed method to look cleaner
  update default scoping to rails 4 standards
  update bcrypt and will paginate gems to resolve errors
update user params to accept admin
expose admin on user edit
Merge branch 'feature/admin-in-user-settings' into develop

* feature/admin-in-user-settings:
  expose admin on user edit
  update user params to accept admin
adhere to rubocop style where possible
Merge branch 'release/rubocop-style-update'

* release/rubocop-style-update:
  adhere to rubocop style where possible
  expose admin on user edit
  update user params to accept admin
  update feed method to look cleaner
  update default scoping to rails 4 standards
  update bcrypt and will paginate gems to resolve errors
  update sass to resolve environment error
  remove ruby version from repo