fixed naming convention in disablenpc
Adding xmas boss fight
Added Final Reward NPC
Merge remote-tracking branch 'CandyCurt/xmas-2013' into xmas-2013

Conflicts:
	world/map/npc/annuals/xmas/config.txt
missed in forced push
Missing )
no Reboot to stop/start or to reoccur/reset.
Merge remote-tracking branch 'wushinfork/xmas-2013' into xmas-2013

Conflicts:
	world/map/npc/annuals/xmas/config.txt
	world/map/npc/annuals/xmas/debug.txt