Merge branch 'master' of github.com:rescrv/HyperLevelDB into hyperdb

Conflicts:
	db/db_impl.cc
	db/db_impl.h
	db/db_iter.cc
	hyperleveldb/db.h
	util/comparator.cc