Updating documentation

Merging the way-overdue documentation that has been sitting around in the dev branch not being looked at.

Merge branch 'dev' into 'master'