Merge: misc: do not enforce shiftwidth to 8, let the .vimrc user config