Formatting updates + font-size handling
Merge pull request #1 from chriseverson/master

A couple updates that deal with font-sizing and the like.