getting rid of hard coded indices for content_tools
Merge branch 'aws-temp' of https://github.com/IVPR/Weave into aws-temp