Add echo output to merge in after_success

Als check if [merge] doesn't trigger a merge because we're committing to master
Merge branch 'master' into travis-merge-on-commitmessage

Conflicts:
	.travis.yml