Fixed py2.6 bug, better setup.py.

Thanks to 100% test coverage I found out I forgot to make a couple of
lines work in python2.6. Fixed.

pep8'ed setup.py.