still trying
Merge branch 'lalinference_roq' of ligo-vcs.phys.uwm.edu:/usr/local/git/lalsuite into lalinference_roq