Custom templates and generic fixes
Compilation+CMake keymaps
Merge branch 'master' of github.com:dbellavista/linux-stuff