Add ctrlp vim plugin.
Fix merging conflict of .gitmodules.