Removed excess code, Fixed timed despawns
Fully updated to 1.5.1, extra file problem is gone
Merge branch 'master' of https://github.com/trc202/Combat-Tag

Conflicts:
	CombatTag/com/trc202/CombatTag/CombatTag.java