As of cancancan 1.8.2, tests pass - closing #943
Merging master
Moar merging