Fix and reorganise travis#2001

Merged

JonRowe merged 2 commits intomasterfrom

fix-and-reorganise

Jun 23, 2018

Commits on Jun 21, 2018

Prevent rake installing incorrect version in app on different rubies
JonRowe
committed
Change travis file to be inclusive rather than exclusive
JonRowe
committed