readded changes from upstream that was removed for some reason
added log.spotify to gitignore