Merge commit '24272d3f2195fc26fee3308793fcb49f21fee375' into update_version

Conflicts:
	lib/client/connection.js
	prototype/server.coffee
server(session): Handle failed writes to the connection gracefully.
Merge remote-tracking branch 'codio/update_version' into 0.7.0-alpha15

Conflicts:
	lib/client/connection.js
	prototype/ws.coffee