Merge pull request #20 from EQEmu/master

Merge of 11-16-2014