Merged in amaltaro's changes to savannah/, and added these interface changes to the other python scripts therexy
remove test.py