Updates for emitter.
Refactored to follow new test rules.
Clean up.
Updates for version 2.
Merge pull request #4 from arb/emitter

Emitter