Added arithmetic operators for conformalmap class.
Merge branch 'develop' of https://github.com/tobydriscoll/conformalmapping into develop