Make format strings 2.6 compatible.
More format string compatability changes.
Merge pull request #1 from trquinn/master

Make format strings 2.6 compatible.