requirements is now dev_requirements. Using py.test and also requires uritemplate.py
per Ian's recommendation
undoing per Ian's recommendation
Merge pull request #160 from esacteksab/docs

First pass at updating documention after expecter and "current" state of things
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	docs/examples/gist.rst
	docs/index.rst