fix indentation and jshint errors
add http for the echonest api
Merge branch 'pepf-master'
Merge remote-tracking branch 'upstream/master'