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
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 https://github.com/aub/octopus

* 'master' of https://github.com/aub/octopus:
  more fixes for ruby 1.8 and travis
  fix 1.8 compatibility
  add rails 4 to the appraisals file
  handle the new-style AR associations that take a scope as the first argument and options as the second.
  handle rails 4.0 scopes in associations
  get the specs passing for rails 4
  use the correct version comparator
  bump the version down for only a minor update
  ConnectionSpecification has moved and BasicObject is deprecated
  don't alias a method that doesn't exist
  simplify rails version checks