Clean up output_aux_components writing
Merge pull request #35 from mandli/output-aux-component-fix

Clean up output_aux_components writing
Merge remote-tracking branch 'upstream/master' into rjl

* upstream/master:
  Clean up output_aux_components writing