Added test configuration
Merge branch 'tox' into python-3
Added python 3.3 and django 1.5/1.6 to tox settings