importing from new go-imap location
Merge branch 'master' of https://github.com/nytlabs/streamtools
Merge pull request #420 from jprobinson/master

importing from new go-imap location