I have no idea what is in this pull request or whether it works because git is an insane vcs#9

jjhollar wants to merge 4 commits into

cms-analysis:mastercms-analysis/DiffractiveForwardAnalysis:masterfrom

jjhollar:masterjjhollar/DiffractiveForwardAnalysis:masterCopy head branch name to clipboard