clean up formatting and typo
Merge branch 'v2.5.x' into v2.6.x
Bring readme up to date for 2.6