Changed ChooseWaveform call to eliminate NULL cache pointer (due to changes in LALSimulation).
Merge branch 'master' of https://github.com/farr/nu-ligo-utils