put mapping support

My put_mapping branch was branched off of the v0.5.1 tag, but it merges cleanly into master (as of 11:45 am today).  I added a couple integration tests and one unit test.  All tests pass (both on the branch and on master after merging it).