Simple test of code using demo-app
Test-merge of pull request
Merge branch 'master' of https://github.com/jewzaam/pyresttest
Set maintainer and add dependencies to distutils config
Document test syntax
Fix README.md
Testing: Net New Branch
Initial mini Django test app
Update test app, create populated test fixture and script to run same
Document test app's API
Merge branch 'testing'
Merge remote-tracking branch 'svanoort/master'

Conflicts:
	README.md
Updated headings in readme