Kinds

Use kind instead of shape to ensure consistency.  That way objects that look the same act the same.

I'd like to make it even more automatic, where we don't need to explicitly specify the position and actions for each kind of object.  We should probably also test to make sure sprites have a kind, and perhaps create helper methods.