lots of updates.  mostly to my vim environment.
removing nerdtree to resolve git issue
restoring nerdtree
Merge branch 'master' of github.com:richhaase/dotfiles

Conflicts:
	vimrc