Updated Travis
Merge