connecting to aws for screenshots
screenshot machine now works
Merge branch 'master' into newmaster