Removing commented out code, removing whitesapce, fixing indentation, and changing some comments from double slash to slash star.
Removing commented out code, removing whitesapce, fixing indentation, and changing some comments from double slash to slash star.
Removing commented out code, removing whitesapce, fixing indentation, and changing some comments from double slash to slash star. Mostly in the original StripTool project.
Removed one final section of commented out code related to some changes made a while ago to PVPrivate.
Removed one more section of commented out code from a change made to AMProcessVariablePrivate while helping Jessie a while ago.
Readded two sets of commented out code that Darren wants in VESPERS2D/3DScanConfigurationView.
Added back in one set of comments in BioXASSideBeamline as per Jessie's request.
Wow, totally missed some hanging non-code. Fixed this error in AMProcessVariablePrivate.
Fixed merge conflicts. Changes were made in the master branch these files. Used the master side changes and removed commented out code or fixed indentation as necessary.
Merge pull request #804 from acquaman/Issue803

Changes were incorporated from @dretrex @helfrij @epengr  and @iainworkman 
Fixed merge conflicts coming out of the major update to master in #665 and a few other minor branches.