Changing to puppet...
Merge pull request #20 from paroxp/develop

Changing to puppet...
Changing Apache and PHP to work as previously in shell, also adding mysql
Missing Vagrantfile
Correct vagrantfile
First stage apache build all working successfully!
Basic nginx module
Add nginx pp file
Killing PHP habbits…

God damn it Jamie… 50 minutes to find this one letter! xD
Pulled the installation of CURL and GIT from the ZSH install function
Merge pull request #22 from mattkirwan/master

Pulled the installation of CURL and GIT from the ZSH install function
Merge pull request #21 from paroxp/develop

Killing PHP habits, which Jamie should be punished for.
Merge branch 'develop' of git://github.com/paroxp/vagrant-dev into paroxp-develop

Conflicts:
	Vagrantfile
	env/support/my.cnf
	vagrant/modules/bootstrap/manifests/init.pp
	vagrant/modules/mysql/manifests/init.pp
	vagrant/modules/mysql/templates/conf.erb
	vagrant/modules/nginx/manifests/init.pp
	vagrant/modules/php/manifests/init.pp
	vagrant/support/apache-site
	vagrant/support/apache.conf
	vagrant/support/my.cnf
	vagrant/support/nginx-site
	vagrant/support/nginx.conf
	vagrant/support/php.ini
Changing configuration around to be a bit more logical, and fixing an inconsistency in folder names
Update Readme to include information relevant to the new puppet setup.
Remove redundant files, fix a bug in mysql
Fix Apache2 problem
Newest PHP warning
Merge branch 'develop' of github.com:jamiefdhurst/vagrant-dev into develop
Merge branch 'refs/heads/develop'

Conflicts:
	env/functions.sh
	env/provision-apache2.sh
	env/provision-nginx.sh