Updating recipes and switching to local infrastructure files.
Merge branch 'master' of github.com:cyberswat/drupal-lamp

Conflicts:
	.drupal_lamp.json
	Vagrantfile