PlaybackService stabilization
Merge branch 'master' of github.com:djselbeck/odyssey