In resolving the conflicts during this merge, I had to remove some of the new tools that had be implemented for IMACS. Check out the master branch right before this merge to pull those back out again -- they should be transferred over to an IMACS "instrument".
In resolving the conflicts during this merge, I had to remove some of the new tools that had be implemented for IMACS. Check out the master branch right before this merge to pull those back out again -- they should be transferred over to an IMACS "instrument".