Update travis to test on 2.1.1
Merge remote-tracking branch 'upstream/master' into ruby_2_1_1
Fixes autosupport loading. Rails issue 14664
Merge pull request #572 from leifcr/ruby_2_1_1

Fix autosupport loading issue (See rails issue 14664), and add test for ruby 2.1.1