Merge pull request #430 from jabooth/funcfitmulti

Remove classmethods from DeformableModelBuilder
Merge remote-tracking branch 'upstream/master' into tidyfitmlfuncs