removed obsolete code preventing trees + convolutions from being used
commit should have been made on master
Revert "removed obsolete code preventing trees + convolutions from being used"

This reverts commit f738a90015c262dd58534d7a5f2e4e7aadc6cd98.
removed now-obsolete code preventing trees + convolution from being simultaneously enabled
Merge branch 'master' into npRmpi