Adding the removal of default vhost definitions.
Fixing various issues with the templates (mainly string boolean issues).