Cosmetic changes, + stop on divergence in iteration.py
Changed file location to data/ in mkrpa2.py