Tabulated test modules
Merge branch 'master' of https://github.com/SCIInstitute/SCIRunGUIPrototype
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #515 from collint8/master

Tabulated test modules. Closes #504