Merge pull request #54 from jeffdh/fix_streaming

Fix AttachToContainer bug

@jeffdh first commit.

LGTM: iansmith
Allow both Attach and WaitOutput as a valid option to "docker run"