Merge pull request #26 from TAMED/staging

I generalized the timer so we can record times and stuff
added infrastructure to specify hookable objects, collision groups (though not robust), and centered hook on bear)
fixed merge conflict
a little cleanup