Update travis build to latest rubies
Merge branch 'master' into leap-class-cleanup