Support rails4.1
Support rails41
Merge branch 'master' of /Users/Carlos/.rvm/gems/ruby-2.1.1@godiva-webapp/cache/bundler/git/composite_primary_keys-dd6cea872b26f417534bba5056bc78528e525c3c

Conflicts:
	lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb