Specify ruby version on Travis
More travis setup
Fix odd merge conflict