More cleaning, updates to entity system

Trying to fix merge conflicts now.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/dynisdev/bukkit/venturecraft/components/entities/EntityNewDragon.java