Don't show macros in #output.  Show broken entities in grey
Hide indent guides
Merge branch 'master' into gh-pages