pantheon settings.php
Merge branch 'pantheon/master'