Fix Readme to account for doc reorganization
Fix Makefile options section
Fixes as per Mark's suggestions
Improve wording of top-level Makefile description
Additional fixes
Merge pull request #333 from sbesson/rebased/develop/10687_README

Fix readme (see #10687) (rebased onto develop)