Support status icons w/ legend
Merge branch 'master' into gh-pages