Update travis.yml
Merge branch 'master' of github.com:fontdirectory/merriweather