Resolve merge conflict
Commenting and organization of vimrc
Switched Vim to use spaces instead of tabs.