Remove conflict cruft from an old merge.
Configure googletest only if testing.
Merge remote-tracking branch 'origin/master'
Add missing boost dependency.
revised big merge
Merge branch 'master' of https://github.com/SCIInstitute/SCIRunGUIPrototype into WORKING_BRANCH
Windows compile fixes
Windows Link fixes
Fix/improve test
Clang fixes
committing changes before merging with dans fixes
resolved merge conflicts