Merge branch 'heroku-port-config' into my-master

Conflicts:
	src/socketio.coffee
Merge branch 'object-message' into my-master