remove codeblocks layout file
fixup .gitignore
Merge branch 'master' into format_reconciliation