2013-09-15
Merge branch 'master' of https://github.com/kerry-hz/vim

Conflicts:
	vimrc