Merge pull request #16 from DavidS/master

per your comment on the last PR
Fixing foreman installation when puppetlabs repo is present
Update template syntax for 3.2