Squashed '.vim/' changes from f61a7d7..e4feb52

e4feb52 Temp fix to test subtree
fe9b22a Updated vimrc

git-subtree-dir: .vim
git-subtree-split: e4feb52facae805135636ee292e0899c9b1f7b1a
Merge commit 'ea4a69cf9731c97381764276a5d3af1826431c88'