six 1.8.0 and gunicorn._compat

closes #904 and #905
Merge pull request #906 from collinanderson/six1.8.0

six 1.8.0 and gunicorn._compat