Removed autoload and bundle folders from repo, updated vimrc with latest settings
Handled conflicts