Remove syntax not available in python 2.6
Merge pull request #91 from ameade/fix-py26

Remove syntax and unittest functions not available in python 2.6