Bringing Sigma and my fork to alignment

Fixed various merge differences, fixed importing of OBJ files to properly handle uvs and normals