apply outputConfig in standard way by removing old config and applying new including this.outputConfig
Merge remote-tracking branch 'upstream/master'
changed tabs with 4 spaces
Merge pull request #228 from emoen/master

apply outputConfig in standard way (r=@bartvde)