Folded Catalytic/FixErrors code into Motr.  Updated the README appropriately.
Merge branch 'refs/heads/master' into withcatalytic

Conflicts:
	README.txt
Line ending nonsense.
Merge branch 'refs/heads/master' into withcatalytic
Added auto-track features back into Catalytic.  Currently, all the buttons work, but the results are insane.
Auto-track multiple now can track effectively, at least in some cases.  Also fixed bug with when converting Motr tracks to .ann, in which the background image was getting written in col-major order, which is wrong.
Better default tracking params, catalytic() will take an optional file name arg now.
Improved zoom behavior.
Eliminated Catalytic dependence on .ann files, now uses .ctc files.
Catalytic: Added Undo menu item.
Fixed some bugs with auto-tracking.
Catalytic: Cleaned up some labels, added 'off' option to auto-zoom popup menu.
Catalytic: Added 'Cancel' button to tracking settings.
Catalytic: Refactoring model-y and view-y parts of AutoTrackSettingsController
Catalytic: Refactored AutoTrackSettingsController into an MVC triple.
Catalytic: Minor cleanup of track settings code.
Catalytic: More minor cleanup of track settings code.
Catalytic: Even more minor cleanup of track settings code.
Added comment to AutoTrackSettingsModel.m
Merge branch 'master' into withcatalytic