Cleaned up shopkeeper plugin a little, still needs work
Fixed a tiny logic flaw in the GameServer tick
Merge pull request #4 from FearTheDust/master

Redoing shops again