Enhance Travis-CI

Some minor improvements for Travis-CI