* Fixing .each entries in template files.
* Modify vhost definition to be more modular.