Merge pull request #306 from bstell/master

Change TachyFon to TachyFont
Merge remote-tracking branch 'upstream/master'