added The Echo Nest API
Merge branch 'master' of https://github.com/rossnanop/wunderground-music

Conflicts:
	.gitignore
	music.py