Conbine .vimrc and .vimrc_local.
Merge branch 'master' of https://github.com/kametaso/dotfiles

Conflicts:
	home/.vim/bundle/.neobundle/install_info