Random refactoring
Merge branch 'master' of github.com:sajmoon/spotify-nodupe