remap nerdtree to use leader, turn beeping off
Merge branch 'master': statusline and nerdtree

Conflicts:
	.vimrc