Upgraded the codebase for klein 0.2.1.

0.2.1 fixed a bug in requestMock which otter had a workaround for, the
workaround is now gone.
Merge branch 'master' into upgrade-klein

Conflicts:
	requirements.txt
Merge pull request #296 from alex/upgrade-klein

Upgraded the codebase for klein 0.2.1.