Fixed bug where merchants sometimes wouldn't move
Merge branch 'dev' of github.com:TylerSandman/cc3k into dev
Fixed seg faults when restarting a game. Moved events into proper order.