fix readme
Merge commit 'refs/top-bases/t/coreseek' into t/coreseek
fix merge in .gitignore
Merge commit 'refs/top-bases/t/cs_branding' into t/cs_branding