Cleaned up puppet support and added second DVD import capability for CentOS