Slight updates to our user documentation.
Merge branch 'master' into issue31