Merge pull request #24 from OmgImAlexis/master

Merging Stuffs
Removed Erroring and Unused Import

ModBlockOre was still being imported into ModBlocks, even though it no
longer exists. Now it doesn't.
Armour, achievements and worldgen
Fixed items import
?
Fixed?
Merge pull request #33 from OmgImAlexis/shnupbups

Merged.