Merge branch 'nms' of github.com:IDragonfire/DragonAntiPvPLeaver into HEAD

Conflicts:
	com/github/idragonfire/DragonAntiPvPLeaver/DAntiPvPLeaverPlugin.java
	com/github/idragonfire/DragonAntiPvPLeaver/listener/DAntiPvPLeaverListener.java
	com/github/idragonfire/DragonAntiPvPLeaver/listener/DebugListener.java
	com/github/idragonfire/DragonAntiPvPLeaver/listener/DirtyListener.java
	com/github/idragonfire/DragonAntiPvPLeaver/metrics/Metrics.java
	com/github/idragonfire/DragonAntiPvPLeaver/npclib/NpcEntityTargetEvent.java
	com/github/idragonfire/DragonAntiPvPLeaver/util/Updater.java
	com/topcat/npclib/DragonAntiPvPListener/NPCManager.java
	com/topcat/npclib/DragonAntiPvPListener/entity/HumanNPC.java
	com/topcat/npclib/DragonAntiPvPListener/nms/BServer.java
	com/topcat/npclib/DragonAntiPvPListener/nms/BWorld.java
	com/topcat/npclib/DragonAntiPvPListener/nms/NPCEntity.java
	com/topcat/npclib/DragonAntiPvPListener/nms/NPCNetHandler.java
	com/topcat/npclib/DragonAntiPvPListener/nms/NPCNetworkManager.java
	com/topcat/npclib/DragonAntiPvPListener/nms/NullSocket.java
	plugin.yml