Updates for EFG
Merge branch 'EFG' of github.com:speedytwenty/drupal-lamp into EFG

Conflicts:
	Vagrantfile