Pushing spike for stoping repeat songs
fix merge conflicts
first pass at echonest algorithm
took out debugging 'p's
Merge pull request #5 from tiger-swallowtails-2013/get_different_songs_algo

Get different songs algo