Updated .vimrc with some new tweaks.
Merge conflict.