Merge pull request #1294 from rrthomas/master

Includes of non-fontforge headers should use angle brackets, not quotes