Add mapping mechanism so that we can use the same env everywhere
Make sure mappings gets passed in correctly
Be more graceful when no mappings are passed in
Merge pull request #17 from sorenh/mapping

Add mapping mechanism so that we can use the same env everywhere