misc
Merge branch 'master' of http://github.com/j3parker/dotfiles
Some vim stuff
ignoring stuff