Cleanup of Model.__add__() + two bug fixes

This re-organizes Model.__add__() slightly for better readability (to me, anyway...)

It also fixes two small, minor bugs:
    - fitter.py failed with very old IPython
    - Thanks file out of date.