Tweak dict comprehensions for Python 2.6 compatibility
String interpolation fix for Python 2.6
Re-add 2.6 compat in Travis, setup.py
Add 2.6 to tox
Missed a bunch of {}'s
Merge pull request #16 from bitprophet/python-2.6

Add Python 2.6 support back in (?)
Merge branch 'master' into relative-imports