Squashed 'vimrc/' changes from 47a202a..bbe931c

bbe931c Added tabstop setting

git-subtree-dir: vimrc
git-subtree-split: bbe931cc55200cc9c84559182f847bb8e5f286b6
Merge commit '96d2bdb1db76fceb7eb53f95287b4cae8781e173'

Import updates to .vimrc