Change difftool to vimdiff.
Merge branch 'dev_vimrc'
Change vim colorscheme.
Merge branch 'dev_vimrc'

Conflicts:
	.vim/userautoload/vimrc_neobundle.vim
Merge branch 'dev_vimrc'
Merge branch 'dev_vimrc'
Merge branch 'dev_vimrc'
Merge branch 'dev_vimrc'
Improve spell check directory.
Setting hybrid colorsheme.
Merge branch 'master' of https://github.com/huyu398/dotfiles
Merge branch 'dev_vimrc'
Implement git status prompt.
Update spell check dictionary.
Update spell check dictionary.
Merge branch 'dev_zshrc'
Modify to call neobundle#rc().
Merge branch 'dev_vimrc'

Conflicts:
	.vim/userautoload/vimrc_neobundle.vim