Changes to spec helper
Merge branch 'master' of github.com:CTA/elastix