Merge machinery for plotting form factors with standard test and plot facilities

Edited by Joachim Wuttke