Made command line output less cluttered (and, in one case, less misleading).
Merge pull request #1081 from ContinuumIO/test_script_cleanup

Made command line output less cluttered (and, in one case, less misleadi...