Speeding things up and making the shooter the default
Merge branch 'master' into gh-pages

Conflicts:
	src-cljs/life/core.cljs
	src/life/life.clj