Add NERDTree and JSON support
Set key bindings for Syntastic and NERDTree
Merge master to resolve conflict

Conflicts:
	.vimrc