Fix formatting for Python 2.6
Fix for testing 2.6
Use unittest2 for Python < 2.7