Added HopperMinecarts, ExplosiveMinecarts and CommandMinecarts. Minor code refactoring & cleanup.
Fixed merge conflicts