Added haproxy to drupal recipie
Added dynamic cpu/mem
Merge branch 'develop' of github.com:tobybatch/DrupalChefVagrant into develop

Conflicts:
	Vagrantfile