'merge'
Merge branch 'master' of https://github.com/xqin/dotvim
Merge branch 'master' of https://github.com/xqin/dotvim
add new plugin ctrlp