tweaks to current_screen_details.py and sh.
Merge branch 'v1-train' of https://github.com/owdqa/OWD_TEST_TOOLKIT into v1-train
Merge pull request #41 from roydude/v1-train

V1 train