lots of changes for setup
Merge pull request #12 from cherylc/add-cancan-authorization

lots of changes for setup