Fixed keybinding conflict introduced as part of #526.
Merge pull request #551 from dsimmons/fix/nerdtree-keybinding

[Fix] Keybinding conflict introduced as part of #526.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fixed keybinding conflict introduced as part of #526.