Remove commented out html
Change word code to match form
Set up skipped words earlier so we can skip creating popcorn events that are not necessary
Merge branch 'master' into gh-pages

Conflicts:
	player.html