Get tests passing on 1.6 and 1.7, at least on Python 2.7.

Help me out, travis.