Merge branch 'master' into agj/fix-ci

Author: benjaoming

.gitignore

@@ -21,6 +21,9 @@ sphinx_rtd_theme/static/fonts/Lato/
 sphinx_rtd_theme/static/fonts/RobotoSlab/
 .python-version
 .node-version
+.tool-versions
+.nvmrc
 sphinx_rtd_theme/static/js/html5shiv.min.js
 sphinx_rtd_theme/static/js/html5shiv-printshiv.min.js
-.nvmrc
+.direnv/
+.envrc