Add config.js
Merge branch 'master' into session_commute

Conflicts:
	io.js