fixed filename  value in Content-Disposition
adepeted resulting puppet manifest to official puppet style guide
Merge branch 'master' of https://github.com/frastel/Puphpet into frastel-master

Conflicts:
	src/Puphpet/View/Vagrant/Modules/php.twig
Adding spacing and twig comments