Deprecate old shape adders and warn on use

Deprecate addCircle and addRectangle functions in favor of using addShape, so
that in the future it will be easier to add shape types to the Builder.