Added @Override annotations and removed unused imports
Removed __OBFID from some world gen files
Merge branch 'Fuwnayguy' into bigUpdate

Conflicts:
	src/main/java/enviromine/blocks/BlockBurningCoal.java