cleanup changes

[ci skip]
update travis.yml versions
Merge branch 'master' into smart-text