Merge pull request #144 from alexmckenley/dev

Refactored playlists to queues