Singletons added;
Default host and vhost changed
Authored by: bittorf 2011-11-14
Parent: [r5090]
Child: [r5092]
