Updates from tapatai.
Handle apache configs better (don't overwrite, use new switch).