Use r10k instead of librarian-puppet
Deleted librarian puppet task
Change comment to read r10k
Add concat, dep for apache
Rename php
Added puppi, dep for php