Use parameterized server/config.pp instead of defined type, cleanup.
Per http://docs.puppetlabs.com/guides/templating.html do not use has_variable(), but '@'.
Merge branch 'test'