Merge pull request #39 from lkaina/master

Update socket logic with respawn and powerup timers
Fix merge bugs
Have powerups spawn farther out
Merge pull request #40 from rohaus/master

Fix merge bugs
Fix incorrect property names
Merge pull request #41 from rohaus/master

Fix incorrect property names