merge
Merge git://github.com/EQEmu/Server into Development
Fixed most of the compiler warnings and cleaned up some code in spells_effects.cpp
Small bug fixes with encounters, also added eq.load_encounter_with_data(encounter_name, data_string) and unload as well.  Allows you to send a message via the encounter system load
Fixed potential crash related to Pets/Mercs buffs when targeting themselves.
Fix for duplicate merchant items when same merchant types are in same spawngroup.
minor clear up of 2handstaff block effect code.
Manual merge of new faction system (#256).
Clean up some personal signatures.
Merge pull request #276 from KayenEQ/Development

Fixed compiler warnings and clean up of some code in spell_effects.cpp
(RicardoCampos) End looting before zoning.