Added Current file location of Vagrantfile, so that a provision can occur within directories.
Merge branch 'master' of github.com:newmediadenver/drupal-lamp
Updated instructions for installation
Added note about restarting virtual box for mavericks
Removed override.
Fixing stuff.
Merge pull request #127 from timodwhit/instructions

Add Instructions to readme file.
Adjusted Vagrantfile to launch initially with no shares.
Updated readme to include information on the new Drupal-NFS cookbook.
Merge branch 'master' into 89-re-work-share-arch

Conflicts:
	Vagrantfile
Updates the readme to talk about CSS Preprocessor change as mentioned in newmediadenver/drupal#49 and newmediadenver/drupal#50
Removed virtualbox reference.
Fixes type
Merge pull request #129 from chrisolof/89-re-work-share-arch

Resolves #89:  Assets folder share architecture re-worked
Fixed typo to make arknoll and chrisolof happy
Merge pull request #130 from timodwhit/css_pre_pull

Updates the readme to talk about CSS Preprocessor.
Dropped drush override, specified drupal 7.26 as our default drupal version.
Merge pull request #131 from chrisolof/updates-to-default-json

Fixes #102, Fixes #117:  Dropped drush override, specified drupal 7.26 as our default drupal version.
merge master