Merge pull request #19 from cloudify-cosmo/circle-update

update circle.yml to deal with PR and add circle icon to README.md file

Author: fogelomer

README.md

@@ -1,5 +1,6 @@
 # Cloudify Puppet Plugin
 
+* Master [![Circle CI](https://circleci.com/gh/cloudify-cosmo/cloudify-puppet-plugin/tree/master.svg?style=shield)](https://circleci.com/gh/cloudify-cosmo/cloudify-puppet-plugin/tree/master)
 * Master Branch [![Build Status](https://travis-ci.org/cloudify-cosmo/cloudify-puppet-plugin.svg?branch=master)](https://travis-ci.org/cloudify-cosmo/cloudify-puppet-plugin)
 
 Cloudify plugin for the [Puppet](http://puppetlabs.com/).

circle.yml

@@ -1,5 +1,14 @@
-dependencies:
+checkout:
   post:
+    - >
+      if [ -n "$CI_PULL_REQUEST" ]; then
+        PR_ID=${CI_PULL_REQUEST##*/}
+        git fetch origin +refs/pull/$PR_ID/merge:
+        git checkout -qf FETCH_HEAD
+      fi
+
+dependencies:
+  pre:
     - pyenv local 2.7.9 
   override:
     - pip install tox
@@ -9,4 +18,4 @@ test:
     - tox -e docs
     - tox -e flake8
     - tox -e py27
-#
+