didn't need quite so much indentation
Merge branch 'joeyconfig'