Shuffled some gems around
Some travis config tweaks