Pull Request: Issue681

This merges in the changes to allow the scan to use both single element vortex detector and four element detector inside of the various scans (2D, Line Scan, and XAS).  It has been tested and appears to work.  This resolves #681.