Merge branch 'master' into enhancement_errors_update

Conflicts:
	tools/test-requirements.txt

- Added Upate for 'responses', version 0.4.0 supports Py3
- Updated minimum coverage to 88%

Author: BenjamenMeyer

setup.cfg

@@ -6,4 +6,4 @@ cover-package=stackinabox
 cover-erase=1
 cover-inclusive=true
 cover-branches=true
-cover-min-percentage=83
+cover-min-percentage=88

stackinabox/tests/test_responses.py

@@ -18,7 +18,6 @@
 logger = logging.getLogger(__name__)
 
 
-@unittest.skipIf(six.PY3, 'Responses fails on PY3')
 def test_basic_responses():
 
     @responses.activate
@@ -34,7 +33,6 @@ def run():
     run()
 
 
-@unittest.skipIf(six.PY3, 'Responses fails on PY3')
 def test_advanced_responses():
 
     def run():

tools/test-requirements.txt

@@ -1,10 +1,10 @@
 coverage
 ddt
-httpretty==0.8.8
+httpretty==0.8.6
 nose
 nose-exclude
 pep8
 requests
 requests-mock
-responses
+responses>=0.4.0
 six

tox.ini

@@ -12,6 +12,7 @@ commands = nosetests {posargs}
 [testenv:py34]
 deps = -r{toxinidir}/tools/test-requirements.txt
 commands = nosetests {posargs}
+setenv = VIRTUAL_ENV={envdir} LC_ALL = en_US.utf-8
 
 [testenv:pep8]
 deps = setuptools>=1.1.6