Add setting
Merge branch 'master' of github.com:violetyk/dotfiles

Conflicts:
	.vim/bundle/neobundle.vim
	.vimrc