REL: 2.1.1

@gregcaporaso @jairideout, could one of you review please? Once this is merged, will tag, push to pypi and then issue a PR to bump to 2.1.1-dev