Decorators and module building
merge master, clean up doc-gen.coffee