test hiredis builds with tox
Add BusyLoadingError exception to differentiate -LOADING errors from connect errors.
Add CONFIG RESETSTAT support.
pytest framework and server commands
pytest config file
Merge pull request #352 from yossigo/config_resetstat

Add CONFIG RESETSTAT support.
pep8
changelog
Merge branch 'master' into pytest

Conflicts:
	tests/server_commands.py
bad merge conflict
BusyLoadingError should inherit ConnectionError.
Merge pull request #351 from yossigo/busy-loading

Add BusyLoadingError exception.
connection pool tests
Merge branch 'master' into pytest
pipeline tests converted to pytest
python 2.5 compat
locking tests in pytest
encoding tests
pubsub tests
python 2.5 support