updated bootstrap, refactored Vundle
Merge branch 'master' of https://github.com/olivertaylor/dotfiles

Conflicts:
	vim/vimrc