Commented out all the emitter stuff for now
Merge branch 'master' into gh-pages