Merge pull request #13 from tsauerwein/deform-map

Add support for geometry types to deform
Allow to overwrite the form template