New branch for cleaner history, old one was getting really weird.
Update config_default.php
Merge branch 'master' into site-integration
Added about-tools page.
Merge branch 'master' into site-integration.
Merge branch 'master' into site-integration