new plan, re-alphabetized
Merge pull request #336 from laurawendell/patch-20

new plan, re-alphabetized