refactoring
better dir handling
maintian encoding when uploading to s3
adding package
Merge pull request #2320 from guardian/screenshot-tidy

Screenshot capture tidy