Continuation of #966: Adding E_METAs

Adds `E_META` values to `BlockID.h`

Fixes merge issues with #966.
But these last should have stayed as E_META_NEWLEAVES, they are for the E_BLOCK_NEWLEAVES blocktype.
There are two kinds of leaves blocks, and two kinds of log blocks. Name them correctly.