Update README
Merge branch 'master' into stackhammer-WardCunningham-master