phew.
Merge branch 'master' of https://github.com/bclune/configs

Conflicts:
	.vim/bundle/nerdtree