init
Merge branch 'master' of github.com:jswh/vim-configuration
merge