Updated to new ITK and Elastix