JC: model rspec passes. Removed a duplicate migration for role id.
Merge branch 'master' of github.com:emclab/projectx