Merge branch 'master' of github.com:klmr/.files
Merge branch 'master' of github.com:klmr/.files
Merge branch 'master' of github.com:klmr/.files
Fix vim indentation settings