-added changes from errors due to merge from puppetlabs/master
- added usage of vhost_enable_dir when not on debian with setting $use_vhost_enable_dir to true