More consistent use of 'playlist' / 'play queue'
Simple mode library bugfixes. Fixes #565
Merge pull request #567 from 8u/master

Simple mode library bugfixes. Fixes #565