fixes, including shim'd playlist
Merge branch 'master' of https://github.com/alexanderjfink/pal

Conflicts:
	public/javascripts/app/practice-session/setup/setup.html