Added a few items to the .vimrc
Fixed merge issues