support for multi-keyed maps
whitespace cleanup
Merge pull request #43 from eoneill/master

minimal support for multi-keyed maps