Merge pull request #18 from chrisolof/whitespace-fix

Whitespace adjustment (removed extra indentation spaces)
Fix github URL for drupal submodule in .gitmodules

URLs starting with git@github.com are only accessible by the repository owners, but not by other users.
Fix github URL for drupal submodule in README.txt

URLs starting with git@github.com are only accessible by the repository owners, but not by other users.
Merge pull request #22 from znerol/patch-2

Fix github URL for drupal submodule in README.txt
Merge pull request #21 from znerol/patch-1

Fix github URL for drupal submodule in .gitmodules
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