Moving to a unified site.pp file
Moved door43.org config into site.pp
Updated makefile, finished moving to a unified site.pp