comment-functions removed (since now in separate package "commentr").
Merge branch 'Remove-commentr'