ore
Merge branch 'master' of github.com:jlgarhdez/dotfiles

Conflicts:
	vim/bundle/neobundle.vim
	vim/vimrc