Merge pull request #150 from chadlung/master

Update to uWSGI 1.9.6 or newer
Make PEP8 happier
Merge remote-tracking branch 'upstream/master'