Added more shapes for hit testing.

Also deprecated hitRect in favor of hitShape.