Update dotfiles
Add .gvimrc
Merge branch 'master' of https://github.com/tan-yuki/dotfiles

Conflicts:
	.gitignore
	.vim/bundle/neobundle.vim
	setup.sh