conjunctions & disjunctions, templates, richer features
Merge branch 'master' of git@github.com:nschneid/features-note.git
Hastie et al. cite