fixed resample to support stereo, v0.1.0=>0.1.1dev
Merge branch 'master' into develop

Conflicts:
	librosa/__init__.py