MASSIVE CLEANUP, Now on 1.5.2

Actually went to 1.5.2 now. Cleaned up tonnes of stuff, moving most
blocks into metablocks to save on the huge number of ID's I was using.