removed nerdtree from vimrc
Merge branch 'master' of github.com:AWinterman/dot

Conflicts:
	zsh-update