Revert "VIm: use 4-spaces indentation"

2 spaces is better

This reverts commit 393e2653f3f363f9a9bc30f3d82c8d2b4c7f85e3.
Merge branch 'master' into netbook