Merge branch 'improvement-to-documentation' into 'master'

General improvements to the documentation

Closes #336 and #237

See merge request !540
6 jobs for master in 5 minutes and 36 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Test
passed #376012
basic-2.7

00:00:55

passed #376013
basic-3.7

00:00:44

passed #376014
python-2.7

00:05:05

passed #376015
python-3.7

00:05:18

68.0%
 
  Deploy
passed #376016
pages

00:00:16

passed pages:deploy

00:00:01