fix machine IP Address (private_network)
Update nginx.conf to match Box IP
Update README.md
Merge branch 'master' into hotfix/box_ip
Merge pull request #8 from hexa2k9/hotfix/box_ip

fix machine IP Address (private_network)
make '/var/www' be mounted as 'www-data'

This avoids permission problems while writing files in there. Got some of those errors while implementing hhvm as an additional FastCGI upstream.
Merge pull request #9 from hexa2k9/hotfix/mount-options

make '/var/www' be mounted as 'www-data'
Enable NFS mounts in vagrantfile

The nfs did not work on MacOSX. With this little change the nfs mount is working.
Merge pull request #10 from markusguenther/patch-1

Enable NFS mounts in vagrantfile
Fixed Vagrantfile and cleaned up
Merge branch 'master' into develop
Revert "Enable NFS mounts in vagrantfile"

This reverts commit a36bb00c70bf8d368657d8ff47bc79049086d410.

Conflicts:
	Vagrantfile

This Commit was not working for me (puppet kept asking for a password). So I reverted this.