This is a no-op merge, explicitly considering and rejecting the
de-namespacing from the master branch. After this merge, future
merges from the master branch will pick up any content changes.
$ git merge --log --no-ff --strategy ours master
* master:
*.ipynb: Use absolute URLs to link to the glossary
index.md: Remove YAML front-matter
Remove novice/sql namespace