updates
style, class, and method changes
Merge pull request #1 from ShawnMcCool/tectonic-master

Updates to your proposal for 3.x