temp commit
Merge branch 'master' of https://github.com/koheisg/dotfiles

Conflicts:
	.vim/bundle/neobundle.vim