Clean up readme, add travis-ci build status
Merge branch 'master' into 2.x