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.
Merge pull request #25 from OmgImAlexis/lex

Cleaning up
Merge pull request #32 from OmgImAlexis/lex

Items
Armour, achievements and worldgen
Fixed items import
?
Fixed?
Merge pull request #33 from OmgImAlexis/shnupbups

Merged.
Idek????