Merge pull request #13 from blind-squirrel/Sharon

Sharon
add roles to users & seed
save roles and merge master to local venkman
Merge branch 'master' of github.com:blind-squirrel/blind-squirrel
Merge pull request #14 from blind-squirrel/venkman

Venkman
updating to merge to pull down another version
Merge branch 'master' into Sharon
merging from master
ability to delete users has been added