Merge pull request #61 from fusion94/master

minor changes to style
complete replacement of CanCan for admin/roles Fixes #62
Merge pull request #64 from fusion94/admin

complete replacement of CanCan for admin/roles Fixes #62