Updates Travis
Merge #600 r=@tcr: Updates Travis