Fixed broken comments in .vimrc
More configuration.
Fixed merge conflicts.