Merge https://github.com/leetrout/python-guide
authorKenneth Reitz <me@kennethreitz.com>
Sun, 25 Mar 2012 19:05:15 +0000 (15:05 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 25 Mar 2012 19:05:15 +0000 (15:05 -0400)

Trivial merge