Reorganized the custom Apache conf structure of this server into their own confs, leaving the main httpd.conf clean. Did have to update the main one due to a change in 2.4 that wasn't present in 2.3 (trunk).

I should probably move the custom ones into their own subdirectory.