updated
updated
updated neobundle
updated
updated
Merge branch 'master' of github.com:doloopwhile/dotfiles

Conflicts:
	_bashrc