add some startup stuff
Merge branch 'master' into rocksdb
config files