config cleanup
updated docs
added config/local.php to .gitignore
Merge commit 'ea8325ca2b60e3ebca608af16d36f3ded62b2925' into 4.0