file_uploads as parameter
Merge branch 'master' of https://github.com/icalvete/vagrantfiles

Conflicts:
	apache/puppet/manifests/site.pp