Pin mongo to 1.9.x for JRuby due to compatibility issues.
Merge branch 'develop' of github.com:CanCanCommunity/cancancan into develop
remove supermoder dependency
stop using with_model gem
Remove with_model and supermodel dependancies.
Add ActiveSupport requirement for MetaWhere issues.
move Ability model to support folder
Isolate the controller specs from active record.
Contain active record models to the AR adapter only.
Update InheritedResources controller add-in to use mocked model.
Only set I18n deprecation fix if we need to.
Rename appraisal files and add specs for rails 3.1 and 3.2
Now that supermodel and with_model are removed, we can add 3.1 and 3.2 specs.
Pend MetaWhere tests unless MetaWhere is defined.
Since MetaWhere doesn't support active record >= 3.1, we have to conditionally remove these tests. MetaWhere is planned to be removed in the next major release so this can be removed when that happens. MetaWhere tests still run for active record <= 3.0
Fix .travis gemfile list.
Merge branch 'feature/remove_supermodel' into develop

Conflicts:
	gemfiles/mongoid_2.x.gemfile