update instructions
Merge branch 'master' into redmond

Conflicts:
	config.js