content alterations
Merge pull request #1 from beauvais/master

Zach's mostly formatting changes.