Temporarily remove our psana modifications to ensure compilation with the new psana version
Merge branch 'testing' of github.com:antonbarty/cheetah into testing