* fix .travis.yml
* merge master