switch to cancancan
Merge branch 'enhancements'