merging
more little changes
Merge branch 'master' of github.com:nytlabs/streamtools into sqsfix
Merge pull request #345 from mikedewar/sqsfix

Sqsfix