Add mailcatcher back, for Travis-CI