Fixed a couple of remaining merge issues
Merge branch 'development' of github.com:revbayes/revbayes into development