Added Kevs changes
Updated Submodule
Changed the path if no envrionmental variable is set to be the path of the directory, so that vagrant can be accessed from within the project.
Merge pull request #29 from timodwhit/json_path

Changed the path if no envrionmental variable is set to be the path of t...
Updating recipes and switching to local infrastructure files.
Merge branch 'master' of github.com:cyberswat/drupal-lamp

Conflicts:
	.drupal_lamp.json
	Vagrantfile
Removing a little snarkiness.
Updating drupal reference.
Updated to master
Added Handling for Berkshelf
Changing back to defaults
Merge pull request #32 from timodwhit/latest

Berkshelf Handling
Updated the documentation to cover the berkshelf and the the infrastructure changes.
Updated readme to fully flush out the new json structure.
Updated references to match changes in drupal repository
Updated documentation based on Kevin's notes
Merge pull request #33 from timodwhit/latest

First Shot at new Readme
Added a comma. Turns out those can be somewhat important
Merge pull request #34 from timodwhit/latest

Added a comma. Turns out those can be somewhat important
Adding instructions for vagrant-berkshelf requirement.

The project moved from submodules to Berkshelf for the inclusion of chef cookbooks. This plugin is required for Vagrant to execute this new method.