misc
Merge branch 'master' of https://github.com/scottkirkwood/vim-scottkirkwood
Merge stuff