Cancancan simplifications and others...
Merge pull request #156 from kaspernj/kj/cancancan_simplifications

Cancancan simplifications and others...