Move around some documentation
Merge pull request #704 from jmaas/master

Move around some documentation