corrected test in makefile
Merge branch 'structure' of https://github.com/jhmatthews/python into structure