Merge branch 'master' of https://github.com/thematchboxstudio/cl

Conflicts:
wp-config.php