modified:   vimrc
Merge branch 'master' of https://github.com/xleng/vimfiles
	add desert-warm-256
        add ctrlp