This is a combination of 2 commits.

Misc: tuning travis-ci setup