Merge pull request #1 from example42/master

Upstream pull
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
Adding is_ca and ca_server
Merge remote-tracking branch 'origin/firewalling'

Conflicts:
	manifests/init.pp
	templates/server/puppet.conf.erb
No more hardcodedly disabling ipv4
Setting locale for wheezy (BC maintained). See: http://projects.puppetlabs.com/issues/20897#note-10
Adding show_diffs directive. Used to include diffs in the reports
s/show_diffs/show_diff/
s/show_diffs/show_diff/
Initial freebsd support
Revert "Initial freebsd support"

This reverts commit 21d7b86a6aabba4db5edd30d00124d167a78c473.
Freebsd compat
Merge commit '73a5695'

Conflicts:
	manifests/init.pp
Only using passenger owner settings in mode server
No more managing log dir as this is done by Puppet itself(?)