Ready, I'm going to commit all four at once. Some confusion about indents and stanza structure, but I doubt it's a relevant problem.
Merge pull request #276 from alevan2/master

Ready, I'm going to commit all four at once. Some confusion about indent...