Merge remote-tracking branch 'github/master'
re #425: Move puppet folder into install/vagrant/puppet
Fixed remote host IP address.
Make sure to load xdebug lib for PHP fpm.

This is disabled by default. Included comment with instructions on how to enable it.
Fixed location of catchmail binary.

This allows for using mailcatcher with anything that makes use of the sendmail binary for sending mails, e.g. PHP mail function, etc.
re #442 - Ensure listen.mode is set correctly by overwriting the default www.conf file
re #442 - Ensure listen.mode is set correctly by overwriting the default www.conf file
re #442, #425 - Separate Vagrantfiles: one for using the box, one for (re)building
re #442 - Use separate names in VMware when building the base box
re #442 - Include the purge.sh script
re #442 - Updated README
Merge branch 'hotfix/442-fpm' into develop
Fix code blocks in README
Update README
Merge branch 'master' of github.com:nooku/nooku-vagrant

Conflicts:
	README.md
	Vagrantfile
	puppet/modules/less/manifests/init.pp
	puppet/modules/nginx/manifests/config.pp
	puppet/modules/nginx/manifests/init.pp
	puppet/modules/nginx/manifests/params.pp
	puppet/modules/nginx/manifests/resource/vhost.pp
	puppet/modules/nginx/manifests/service.pp
	puppet/modules/php/manifests/init.pp
	puppet/modules/stdlib/CHANGELOG
	puppet/modules/stdlib/Modulefile
	puppet/modules/stdlib/README.markdown
	puppet/modules/stdlib/Rakefile
	puppet/modules/stdlib/lib/facter/facter_dot_d.rb