Added more efficient parsing for songs
Latest version of echonest bot
Fixed conflicts on EchoNest bot