Merge branch 'master' of github.com:mit-probabilistic-computing-project/BayesDB
Merge branch 'master' into dev