Speed up Travis
Improve 1.8 compatability