Text edits throughout.
Merging changes and resolving minor conflicts.

Merge branch 'master' of https://github.com/SimonGoring/neotoma_paper

Conflicts:
	Neotoma_paper.Rmd
Revisions for final draft.  Fixes in connection with `neotoma` package, and from JW & ECG.