Last bit of house cleaning.

See #2.
Content type detector.

Closes #1.