Updates revision for drupal recipe
Updates to add solr cookbook, sets drupal_lamp.json to deploy/install on both sites for initial run
Merge branch 'nbm' of github.com:nbminc/drupal-lamp into nbm

Conflicts:
	Berksfile