Add --combine-stderr flag

Simple solution for #291