PaytonTurnage/Charl — pull request #1 by PaytonTurnage (2013-12-15 22:00:38+00:00)
Title: Merge esper's edits.

See the full log of commits for details; there are a variety of edits.