Allow opentreelib to run under Python 2.6
Fix tests implementation file so that it runs in Python 2.6
Combined Makefile