Update behavior of 2D variable mapping.
* Update existing specs and implemenation for new behavior.
* Add specs for new behavior.
* Fixes #17.
Merge pull request #21 from the-gss/2D-mappings

Update behavior of 2D variable mapping.