Receive buffer
Merge remote-tracking branch 'origin/member_gumby_thingy' into member_gumby_thingy

Conflicts:
	experiments/dispersy/proxy.py