added ctrlp to vim
merge .gitmodules