Some cosmetic changes

Changed decision tree for py2 / py3 to simpler one, and changed the regex to work simpler.

I did not know of that method. I like it, although it eliminates the possibility that you get the same package twice and the documentation should be updated to reflect this.