Fixed oauth1 tests and fixed tornado and oauthlib deps version
Merge branch 'master' into booby-040