refactored users to have many roles through role_assignments
Merge branch 'master' of github.com:SandStormIT/all-your-rails-base