Fix ContextualizingDAO.
Fix test so that it actually runs.
Merge branch 'master' of github.com:foam-framework/foam