Add foldcolumn and right margin. Reorganize vimrc.