Allow both Attach and WaitOutput as a valid option to "docker run"
Merge pull request #56 from jeffdh/fix_streaming

Allow both Attach and WaitOutput as a valid option to "docker run"

LGTM: iansmith