Fixes remaining deprecation issues

This fixes the remaining depcrecation issues and fixes the problem with
the main cancancan repo not being updated for rspec3.