pytest framework and server commands
pytest config file
Merge branch 'master' into pytest

Conflicts:
	tests/server_commands.py
bad merge conflict
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
encoding fix
updated tox config for pytest
changelog