Merge branch 'kill-more-globals'

Conflicts:
	dist/oasis.min.js.html