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