Merge remote-tracking branch 'fideloper/feature/modules' into feature/package-manager

Conflicts:
	.vpb/packages/fideloper/phpunit/package.sh
	.vpb/packages/fideloper/yeoman/package.sh
	Vagrantfile