Move CMerkleBlock and CPartialMerkleTree to their own file

Code move only.
Oops, that was a test, didnt mean to leave that duplication in there...anyway, yea, it should be moved out.