Removed dependency on future
Merge branch 'develop'

Conflicts:
	librosa/filters.py
	setup.py
Merge branch 'master' into develop