Tidy up resource naming.
Merge branch 'develop'
Add default and error document directives to VirtualHost.
Merge branch 'tmp'