Adding role model and some beginning pieces of roles plugin.
Fixing merge conflicts with the roles stuff.
Adding to the base model.