neobundle changes
neobundle merge done
gitconfig updated