Fix JRuby compatibility under Rails 4.
Fix compatibility under Rails 3.1 and activerecord-jdbc-adapter 1.3.x
Use Appraisal to make local testing with multiple Rails versions easier
Restore travis testing for JRuby and Rails 4.
Merge branch 'jruby-rails4'

Conflicts:
	.travis.yml