Improves core logic organization.
Merge remote branch 'origin/tim-dev' into envy-dev

Conflicts:
	vocaleyes.html
add timing-select function