.travis.yml add conditional for merge to master

This commit shouldn't merge ...