Use Python 2.6-compatible syntax for format()
Merge pull request #84 from mrowe/master

Clean up a bit of python 2.7-specific syntax