Managing ssl and log dir
Adding fileserver, hiera and future parser options
typo in future/parser
Adding manifestdir directive option
Firewall rules
Chaning puppet server so that nslookup can handle it as well
Disabling ipv4 fw rules
Merge remote-tracking branch 'origin/firewalling'

Conflicts:
	manifests/init.pp
	templates/server/puppet.conf.erb