Merged in spec_cleanup (pull request #1)

removes boilerplate specs
Merge branch 'develop' of bitbucket.org:winescout/hos_website into develop
fixes conflict with removed spec file
Merge branch 'develop' of bitbucket.org:winescout/hos_website into develop
resolve conflicts in schema, remove shows, and leave users table. Kept latest version.
adds roles migration using rolify generator
reversed superadmin migration
removes superadmin components from active admin user dashboard, updates the authenticate_active_admin method to use rolify roles
added nested attributes for roles to user model and updated active admin form to have checkbox for roles
when adding new users, there is a working checkbox to assign  roles to a user and roles were added to the user list.
add method to allow user updates without password
remove cruft program tests
add user factory
add user model test for adding role
addressed PR concerns: removed extra comments, edit flash notice on layout index, deleted old view code from main layout
add capybara tests for user sign in
adds capybara test to ensure that a DJ cannot acccess admin dashboard
Merged in user_management (pull request #4)
update user table
update ActiveAdmin user options