Cleaned up various bits of dead code
Merge branch 'thislooksfun' of https://github.com/Funwayguy/EnviroMine-1.7.git into thislooksfun