Removing nerd tree in favor of netrw
Expand tabs to spaces
Shortcut updates
Merge branch 'master' of https://github.com/jameslai/VIM-Configuration

Conflicts:
	.vimrc