whole bunch of changes
Merge branch 'master' of ssh://github.com/toothbrush/spotiqueue