20140529: Wow that typo in the comments regarding O(N**2) went a long time without me catching it...
Merge branch 'master' of https://github.com/danshea/python