Setting to use php 5.5, dl drupal using drush
Changing settings
Merge branch 'master' of github.com:pvhee/drupal-dev-vm

Conflicts:
	provisioning/playbook.yml
	provisioning/vars.yml