Alter the settings to work with Pantheon better
Merge in pantheon work
Merge pull request #72 from fourkitchens/pantheon

Pantheon