local changes
Merge branch 'master' of https://github.com/chezbob/chezbob
vdb_server fails a little more gracefully now, may need some more debugging though