Fixes to filecat.py and test_filecat.py
- improved cvs routines
- cvs includes system_id