Merge pull request #91 from diceydawg/umass_branch

Umass branch
fixed up the show, and edit for users, now approval of users is functional. Also edited users controller so it is not accessible by a user role
fixed conflicts
some minor fixes for now
some minor fixes for now
changing authorization
changing authorization
changing authorization
removing commented code
adding some tasks to deploy
uncommented the gem unicorn, and added back authorization
forgot to update gem lock
Merge pull request #94 from jjliang/staging

Staging
trying something different for devise user route
trying something different for devise user route
trying something different for devise user route
fixing typo
Update staging.rb
requiring some javasccript for home controller
Merge branch 'staging' of github.com:jjliang/databaseui into staging