removing duplicate cn and uneeded conditionals
Update templates to be puppet 3.2.1 warning free
Merge pull request #2 from pdxcat/puppet_32x

Fix puppet 3.2.1 deprecation warnings