vimdiff
update neobundle
Merge branch 'master' of github.com:takuji31/dotfiles