fixed some unresolved merge conflicts
updated move assignment
Merge branch 'development' of github.com:revbayes/code into development