Added prettification support to emit_json decorator, plus minor edits to Makefile