fix whitespace issues in README
Merge branch 'master' into fix-more-gitignores