Setup so secondary hosts don't deliver the main web content.
Merge branch 'master' into gsa

Conflicts:
	.gitignore
Clarify difference in how docs are served in this branch.