20141027-2
Merge branch 'master' of https://github.com/cupyy/vim_local

Conflicts:
	_vimrc