Fix loglik bug in model.cpp + remove refs to trait likelihood