initial can-can setup stuff
Merge in master