rename some values
rebuild distributable js
Merge branch 'master' into workers

Conflicts:
	dist/oboe-browser.js