Wave fine tuning

Made it so that the players have to wait until all goblins are gone
before proceeding to the next wave.  Added a third wave, as well.