first up
Merge branch 'master' of https://github.com/flying-pig/vim_conf

merge