Fixup from numpy removal
Merge http://github.com/behdad/fonttools