Pull 23 fixed

I started with master, cherry-picked the commits in pull #23, then did a pep8 cleanup pass and tweaked some of the test code.

django-ratelimit doesn't use nose (yet), so I didn't switch to `eq_`. But I did make some changes to make lines shorter. I'm not entirely sure it's more readable, though.

r?