Update deploy.sh
Merge branch 'master' into gh-pages

Conflicts:
	deploy.sh
More descriptive deploy.sh
Merge branch 'master' into gh-pages
Regenerate bundle.js using deploy.sh