Merge pull request #34 from jmaas/master

Doc updates
Merge pull request #35 from jmaas/master

Fix --server-override -> --server documentation bug.