Merge pull request #1 from fugu13/master

Bring to production, dang it
Retargets to our updated 1.x repoze.who.
Merge pull request #4 from saebyn/master

Retargets to our updated 1.x repoze.who.