Remove dependency on CanCan
Merge branch 'remove_cancan'