make python more general
slim and scrape script
Merging athena into release.
Merge remote-tracking branch 'upstream/release' into release