update travis-ci config
update README document
resolve conflicts on README document