Update includes and scons
Remove old rocksdb/