Use command-T insteadof ctrlp
Merge branch 'master' of github.com:yuanotes/dotvim

Conflicts:
	vam.vim