Merge pull request #72 from bastelfreak/master

fix for future parser
added manage_webserver param
trying to remove service[http] deps
nex step for removing httpd
next try against httpd
added basix nginx conf
fixed typo
fixed typo
add support for nginx/unicorn

modified puppet::master class for using $webserver.
this can be httpd for apache/passanger or nginx for nginx/unicorn.
nginx is currently only tested on centos7, but should work on evers OS with systemd

the nginx vhost definition is currently a simple file ressource, this should be changed
to nginx::resource:vhost in the future
fixed three typos
fixed typo
added nginx dependency and moved to template for vhost
Merge branch 'feature-nginx' of https://github.com/bastelfreak/puppetmodule into feature-nginx

Conflicts:
	manifests/master.pp
	manifests/unicorn.pp