rearrange some code a little for clarity
fix the `ts` command in sbt to accept multiple words

so e.g. you can do `ts Particle Swarm`