vimrc at work
Merge branch 'master' of github.com:hanzhixing/.vim

Conflicts:
	vimrc.without_plugins
Add .gitignore into the temp directories