Remap non-locals
Merge pull request #22 from chadhietala/bundling

Remap non-locals