Clean up the Screen test format.
Merge branch 'master' of github.com:concerto/concerto
Clean up version checking and make it more fault tolerant.  Close #519.