simplify rails version checks
don't alias a method that doesn't exist
ConnectionSpecification has moved and BasicObject is deprecated
bump the version down for only a minor update
use the correct version comparator
get the specs passing for rails 4
handle rails 4.0 scopes in associations
handle the new-style AR associations that take a scope as the first
argument and options as the second.
add rails 4 to the appraisals file
Slaves with query cache.. :+1:
Creating helper to make cache testing easier
Merge branch 'master' of github.com:tchandy/octopus

Conflicts:
	lib/octopus/version.rb
Merge branch 'feature/fix_travis_config' of github.com:bricknmo/octopus
fix 1.8 compatibility
more fixes for ruby 1.8 and travis
Merge branch 'master' of github.com:tchandy/octopus
Don't load octopus/railtie if Rails is not available

When Rails is not available, loading railtie will result in loading
Rails, which is not expected when using only AR.
When enabling/disabling query cache, make sure we are connected first
Merge pull request #188 from nickmarden/new-cache-middleware

When enabling/disabling query cache, make sure we are connected first
Merge pull request #187 from travis-ci/master

Don't load octopus/railtie if Rails is not available