Port my variant of font-rendering over to dev branch -- adds correct ali...

...gnment behavior and line-wrapping