Added lots of plugins to vim
fixeed merge coflict for .gitmodules