Fix scirun build.
Merge branch 'master' of https://github.com/SCIInstitute/SCIRunGUIPrototype into modules_H
Similar potential bug fix
Get tests building