Updated shapeutils with circle->circle, rect->rect, and rect->circle methods