Added CanCanCan. CanCan 1.6 not fully compatible with rails 4.
Merge pull request #3 from jtoliver/rails_4.0_upgrade

Added CanCanCan