Some changes relate to uwsgi support
Some more changes to provide correct uwsgi support
Merge remote-tracking branch 'upstream/master' into uwsgi_support

Conflicts:
	recipes/web.rb
Merge remote-tracking branch 'upstream/master' into uwsgi_support