Make CBlockIndex a subclass of CBlockHeader
Make GetBlockHash deprecated
Don't create a CBlockIndex for  CDiskBlockIndex::GetHash()