Sync with local.php
Merge pull request #27 from TomHAnderson/local.config

Sync with local.php