Fixed bugs with cancan and devise
Merge branch 'master' of https://github.com/kendram23/devsfornonprofits