Update readme, update travis config
Resolve .travis.yml conflict