Merge branch 'master' into prepare_merge

Brining refactored branch up to date to send PR

Updated to deprecate `purge_vdir` for purging of conf.d on RedHat

Conflicts:
	manifests/init.pp
	spec/defines/mod_spec.rb
	spec/defines/vhost_spec.rb
Remove trailing commas in spec for 1.8.7
Remove 2.6.0 testing
Merge pull request #43 from hunner/prepare_merge

Merge branch 'master' into prepare_merge