travis-ci: move coverage merge back into tox
change XXX to NOTE