Merge pull request #24 from stevemcquaid/sean

Updated schema, attempting to fix passenger error
Fixed errors in cancan ability file, hopeful this will fix the passenger errors