README.md in base directory. Needs work.
Merge branch 'master' into readme-md
Fix references. Other small changes to text.