ugh brackets ate up my filters talk into ndcoslo talk
Merge branch 'master' into gh-pages