clean up Gemfile, modify controller for User role pattern, begin tests
Merge branch 'master' of https://github.com/alexkahn/reservator