Update neobundle.vim.
Update .gitconfig.

Merge non fast-forward.