changed cursor() from recursion to while loop
	modified:   api.py
Merge remote-tracking branch 'upstream/master' into non-recursive-cursor
Failing test for Accept-Encoding header
Merge headers, don't overwrite.
Fixup python3 test failure.
Merge pull request #310 from Lukasa/master

Twython unnecessarily disables compression.
Merge pull request #284 from drevicko/non-recursive-cursor

changed cursor() from recursion to while loop
Merge branch 'master' of github.com:ryanmcgrath/twython into cursor-pages

Conflicts:
	twython/api.py