fix naming
add support for ruby 1.9
vhost: make servername a parameter
Merge branch 'master' of https://github.com/swisstxt/puppet-module-apache into upstream-merge

Conflicts:
	manifests/service.pp