Merge branch 'tox_support' of https://github.com/cabrera/python-memcached into cabrera-tox_support

Conflicts:
	README.md
	tests/test_setmulti.py

1 files changed, 13 insertions, 0 deletions

diff --git a/README.md b/README.md
index 0811f8a..115115e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 [![Build
 Status](https://travis-ci.org/linsomniac/python-memcached.svg)](https://travis-ci.org/linsomniac/python-memcached)
 
+## Overview
+
 This software is a 100% Python interface to the memcached memory cache
 daemon.  It is the client side software which allows storing values
 in one or more, possibly remote, memcached servers.  Search google for
@@ -17,3 +19,14 @@ Please report issues and submit code changes to the github repository at:
 For changes prior to 2013-03-26, see the old Launchpad repository at:
 
    Historic issues: https://launchpad.net/python-memcached
+
+## Testing
+
+Test patches locally and easily by running tox:
+
+    pip install tox
+    tox -e py27
+
+Test for style by running tox:
+
+    tox -e pep8