travis: few tweaks

see commits.
1cb6295 should also help with #21