add cancan in prep for permissions work
:xMerge branch 'master' of github.com:danReynolds/softgroceries