add email travis.ci
travis
add config twitter
resolve conflict