Added keep_dirs and conf_files stuff. The patch added should be enough to fix those errors that I caught while testing it. --HG-- extra : convert_revision : 6ef6087618149fb8463d7cbe25e2c4f99fc9696c