passes tests on mh17 after preproc changes
merge conflict resolution
Revert "update to get_images to reflect preprocessing changes"

This reverts commit 3f824bc46ab790474d753fc422093d3a548a16d9.
Merge branch 'master' into error_fix
re-added challenge synsets (oops)