Pull in some doc improvements I had made on another branch
Trim Apache config to the essentials