Merge branch 'joss_resampling' of github.com:mdhaber/scipy into joss_…

…resampling

Fix redundancy in introduction

REL: tag scipy 0.18.1

REL: Scipy 0.18.0-1 --- same content as v0.18.0 but new tag for Zenodo

REL: tag scipy 0.18.0

REL: release candidate 2 for 0.18.0

REL: release candidate 0.18.0rc1

REL: release 0.17.1

release 0.17.0

REL: tag version 0.17.0rc2