Merge branch 'feature/config' into develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 00:32:11 +0000 (20:32 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 00:32:11 +0000 (20:32 -0400)

Trivial merge