finally ran
Merge branch 'master' of github.com:roguephysicist/calv-test