Merge pull request #24 from DavidS/master

Updates for puppet 3.2 compatability
Adding control over apache package version
Merge pull request #27 from lieutdan13/master

Adding control over apache package version