Non-recursive mappings
Merge branch 'no_recursive_maps'
Added nerdtree