Travis update

Extracted from #51 but may be closed by #44