major optimization work
Merge branch 'master' of github.com:jfmatt/stealth-whale

Conflicts:
	src/game.js
dat paranoia
Merge branch 'master' of github.com:jfmatt/stealth-whale

Conflicts:
	src/game.js
fix merge