update travis
update travis :police_car:
merged