delete .vim/bundle files
Merge branch 'master' of https://github.com/myoan/dotfiles

Conflicts:
	.vim/bundle/neobundle.vim
	.vim/bundle/neocomplcache
	.vim/startup/bundle.vim
merge dev
Merge branch 'master' of https://github.com/myoan/dotfiles

Conflicts:
	.gitconfig
	.vim/bundle/neobundle.vim
	.vim/bundle/neocomplcache
	.vim/startup/bundle.vim
	.vim/startup/color.vim