First rev at wsgi support - working
Merge branch 'production'