a fix for mac (use $USER)
have a dedicated wwwuser
Merge branch 'master-2'

Conflicts:
	Vagrantfile
	provision.sites.sh