Fix nvm test
Add 'tre' function shorthand ofr 'tree'
Merge branch 'master' into at-work

* master:
  Add 'tre' function shorthand ofr 'tree'
  Fix nvm test