Changed dependancy of cancan

cancan has been depreciated for cancancan, updated gem spec to reflect
this.
bundle updated
Merge branch 'ssilvius-master'