Bugfix/postroll restarts

This fixes a bug where we had combined the conditions of player.ended() and the src unchanged, such that we were falling into an else condition which called player.load() whenever player.ended() returned true.
Tried to re-organize.   Better?