Renamed model wrappers to writers
Added WrapCylinder and WrapTorus
Added WrapPseudoSphere
Merged master wrap changes