Added support for pyramid calculations

Surface Area and Volume of a pyramid.  More cleanup.  Preparation for
next release