Fix __init__ methods to return None
Also temporarily re-enable __init__ hack.
Merge branch 'scope-rewrite' of https://github.com/brownplt/lambda-py into scope-rewrite