more vim shit, i guesS
Merge branch 'master' of https://github.com/jdwelch/dotfiles
more vim, apparently.