Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/reversed_hej into WJets
Conflicts: src/currents.cc
Resolution:
Move colour acceleration multiplier functions to header and inline.