Use cargo-compatible layout
Update to master
Update .travis.yml