Tweak README to be clearer about configuration step.
Merge branch 'master' into init-map