refactor to support locals() addition
also uncovered nasty bug in python-phase2 that takes priority
Merge branch 'master' of github.com:brownplt/lambda-py