Move data.py to root dir.  Add 'make clean' rule to Makefile (for running
before checkin).