May as well set tabstop to 2 for my time at BM.
Sorted out small merge conflict in .vimrc