Merge pull request #1413 from Lukasa/docs
authorKenneth Reitz <me@kennethreitz.com>
Sat, 8 Jun 2013 10:13:14 +0000 (03:13 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 8 Jun 2013 10:13:14 +0000 (03:13 -0700)
Assorted docs updates


Trivial merge