Initial drupal script
Merge branch 'master' of https://github.com/neontribe/Vagrant

Conflicts:
	bootstrap.sh