Removed more unneded files, and updated the magic.conf.template.