Documentation edits

Just a few things I fixed up while reading the docs.
locations.rst wording tweaks
Merge pull request #230 from johnduhart/patch-1

Documentation edits