Improve test module
Adjust error
Fix bug(s) with viewscene

Closes #602
Merge branch 'master' of https://github.com/cbrightsci/SCIRunGUIPrototype
Merge remote-tracking branch 'origin/master' into esChris