added berkeley catalog entry, edited scons files to make compile
fixed conflicts
updated tests, catalog entry
Merging
Merge branch 'BerkeleyStoreRebase' of github.com:alexkleiman/mongo-1 into BerkeleyStoreRebase
added loading of collections to catalog entry constructor
fixed merge conflicts
trying to get it to compile