Finally fix Travis deployment

Cannot enforce both master and tagged commit at once - see
travis-ci/travis-ci/issues/1675