README and gitignore changes
Merge branch 'release/odds-and-sods'