CentOS 64 bit fixups
Fix depreciation warnings on templates
Merge pull request #1 from vjanelle/remotes/puppet3fixups

CentOS 64 bit fixups