remove some trailing whitespaces
Merge remote-tracking branch 'upstream/master' and fixed \t bug

Conflicts:
	websockify/websocket.py