Merge branch 'master' into python3

diff --combined setup.py
index 85a07ae,3775c63..d8eb073
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -1,4 -1,4 +1,4 @@@
 -#!/usr/bin/python
 +#!/usr/bin/python3
  
  from distutils.core import setup, Extension
  
@@@ -7,6 -7,6 +7,6 @@@ setup(name = "wrw"
        description = "Simple WSGI request wrapper library",
        author = "Fredrik Tolf",
        author_email = "fredrik@dolda2000.com",
-       packages = ["wrw"],
+       packages = ["wrw", "wrw.sp"],
        package_data = {"wrw": ["makolib/*.mako"]},
        license = "GPL-3")