Fix some bugs and test cancan
Merge branch 'master' of github.com:sikora/siac