compat, no more NERDTree
Merge branch 'master' of github:toddbernhard/dotfiles

Conflicts:
	vim/vimrc