Clean more remnants of the merge conflict
Clean more remnants of the merge conflict

rnathanday/dryad-repo,ojacobson/dryad-repo,ojacobson/dryad-repo,rnathanday/dryad-repo,rnathanday/dryad-repo,rnathanday/dryad-repo,rnathanday/dryad-repo,rnathanday/dryad-repo,ojacobson/dryad-repo,ojacobson/dryad-repo,ojacobson/dryad-repo,ojacobson/dryad-repo