import vm-install-bayesdb changes
Merge branch 'import_bayesdb_changes'