Getting ready for 1.6.1 Work

Cleaning out some redundant code (Golden Apple Recipe and
naturalRegeneration) as well as adding some scoreboard / team stuff