Committing cleaned up code, with updated echonest & youtube api calls