Added 'vhosts' option.
Commented out, recommented stuff that was for puppet testing.