changed gl-util to require makeClass (found in util.js) rather than mergeInto (which makeClass uses, and which is also found in util.js).  also did some more tweaks to the font renderer