Remove vhost and mailhost vhost_autogen.conf

Don't generate it anymore, and remove any existing file from
people's systems
Merge branch 'concat' of github.com:3flex/puppet-nginx into concat