Update README.md
Merge remote-tracking branch 'upstream/master'
No really, add CHANGELOG.