Clean up comments and add remove wp-config-custom.php
tidy up functions.php
merge