Merge pull request #1 from hzsweers/master

merge upstream
more style and usage; slimmed down list of things we hope you know
Merge pull request #2 from aetherson/master

style, usage, slimming end list