Merge branch 'hotfix/box_url' into develop
Merge branch 'update-readme' into develop
Merge branch 'master' into develop
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.
Merge branch 'refs/heads/develop' into feature/hhvm

Conflicts:
	Vagrantfile