Merge pull request #39 from teancom/master

add pdfjam for canz
Merge pull request #40 from teancom/master

Fix php (again?)
remove extraneous php-pecl-gd package
Merge branch 'master' of https://github.com/mikecanz/aws-ec2-puppet