Merge pull request #62 from sli-fox/steph_branch

Critter activation bug fix
Merge branch 'master' of https://github.com/sli-fox/jamms into steph_branch