Fix travis. Update readme
Merge branch 'master' into 1.1
Fix 2.5 updates