Set bufsize=0 and remove stdin flush for consistency across Python 2 and 3
Bump version to 0.3.7
Merge branch 'master' into local

Conflicts:
	setup.py