updated model_and_analyze.py better help, remove "extra" parameter
Changed test to work woth IMP version 2.0.1 and 2.1.1