Fix more Diamond/DiamondCoin and diamond/bitcoin references.
Clean some more cruft.