Merge branch 'master' into effigies-patch-1

Author: oesteban

.circleci/config.yml

@@ -169,6 +169,8 @@ jobs:
           command: |
             git config user.email "${GITHUB_EMAIL}"
             git config user.name "CircleCI Deploy"
+            git checkout -f master
+            cp /tmp/resources/templateflow-skel.zip templateflow/conf/
             git add templateflow/conf/templateflow-skel.zip
             git commit -m "rel(${CIRCLE_TAG}): Update S3 skeleton file [skip ci]"
             git push origin HEAD:master