VIm: use 4-spaces indentation
Merge branch 'master' into netbook