k2DriftTracker, MergeImages updated

A new directory structure is implemented in k2DriftTracker.
MergeImages now has an option for the K2 camera and pre-whitening is
effectively turned off.