Update psfex module to allow for XWIN_IMAGE, and similar.  Also allow backwards compatible syntax