Some cancanification
Get away with less now that we have cancan
Refactor abilities a bit