Update travis configuration
Add some badges to the readme
Merge from upstream
Update README