modified wavefront to have a "plot" routine, and focal_plane_psfex to return shapes in addition to moments