Use screenshots_dir as the parameter to specify where to save screenshots
Capture screenshot on failure
Take a screenshot manually
Merge branch 'screenshots'
clean some cruft