Merge pull request #31 from spulec/master

Additional fixes needed for py3k
releasing 0.5.9 with py3k fixes
adding python 3.3 to travis configuration
Allow multiple methods for the same URI
use .text instead of .content
Merge remote-tracking branch 'upstream/master'
Included latest commit from upstream.
Merge pull request #32 from hughsaunders/master

Allow multiple methods for the same URI
fix missing dictionary conversion in get_next_entry and add new test for this
Merge pull request #33 from hughsaunders/master

fix missing dictionary conversion in URIMatcher.get_next_entry.
bumping to 0.5.10 + updating readme, changelog and adding a contributors list
httprettified decorator for TestCases
Merge pull request #41 from coagulant/feature/class_decorator

httprettified decorator for TestCases
global state
0.5.11
httpretty now works well with non-http protocols. closes #34
0.5.12
removing undesired file. #shameonme :poop:
renaming test