add thrift
Merge branch 'master' of github.com:eric-zhu5121/vimrc
Merge branch 'master' of github.com:eric-zhu5121/vimrc

Conflicts:
	vimrc
add autopair
Merge branch 'master' of github.com:eric-zhu5121/vimrc

Conflicts:
	vimrc