Continuing Basic Typography

This is just a continuation of #179 which rebases it on the latest master and fixes up a few issues.

We still need something figured out for handling development/production with typography.com, but this should function for now.