base
bumping tangler and settings_compile
Merge branch 'master' of github.com:winmillwill/drupal-panopoly-framework

Conflicts:
	composer.json
	composer.lock
	config.yml.dist