Fixed pull request, fixing `_` in var names and adding bijection test

[From here](https://github.com/ethereum/serpent/pull/20)