Merge with aws-temp, fixed bug in creation of csv data source
Merge branch 'aws' of https://github.com/IVPR/Weave into aws