Update nerdtree settings
Fix some other stuff
Update some stuff
Merge branch 'master' of https://github.com/ambidexterich/dotfiles

Conflicts:
	vim/_vim/.netrwhist