Arguments that are like options
use os.name rather than os.uname()[0] so documentation builds on windows
Merge remote-tracking branch 'pwm-fork/3.x-maintenance'
Merge pull request #219 from ryanhiebert/option-like-arguments

Fix a minor typo in docs
Merge remote-tracking branch 'origin/master'