Bringing this issue over from CCSI-Toolset/foqus#42 (which came from Jira before that, I believe) Combine the 2D and 3D models and update documentation to reflect the merger.