Simple seems to work better. 

I have got rid of .jhbuildrc-custom since .jhbuildrc was riddled with flaws and needed to be rewritten anyway then there is no point having two modified files to do the same job.