Merge remote-tracking branch 'origin/master'

setup.cfg

@@ -1,6 +1,6 @@
 [bumpversion]
 current_version = 0.1.1
-files = setup.py meta.yaml fibrous/__init__.py
+files = setup.py conda-recipe/meta.yaml fibrous/__init__.py
 commit = True
 tag = True
 tag_name = {new_version}