Fix Greenkeeper Lockfile CircleCi setup

Author: sbstnmsch-zz

.circleci/config.yml

@@ -26,9 +26,9 @@ jobs:
           # fallback to using the latest cache if no exact match is found
           - v1-dependencies-
 
-      - run: npm -g install greenkeeper-lockfile@1
+      - run: npm install greenkeeper-lockfile@1
       - run: npm install
-      - run: greenkeeper-lockfile-update
+      - run: ./node_modules/.bin/greenkeeper-lockfile-update
 
       - save_cache:
           paths:
@@ -38,4 +38,4 @@ jobs:
       # run tests!
       - run: npm test
 
-      - run: greenkeeper-lockfile-upload
+      - run: ./node_modules/.bin/greenkeeper-lockfile-upload

README.md

@@ -1,11 +1,7 @@
 # Microservice with Micro, Typescript, Jest and Prettier boilerplate
 
-<<<<<<< Updated upstream
-[![CircleCI](https://circleci.com/gh/nerdsofalltrades/micro-typescript-jest-prettier-boilerplate.svg?style=svg)](https://circleci.com/gh/nerdsofalltrades/micro-typescript-jest-prettier-boilerplate) [![Greenkeeper badge](https://badges.greenkeeper.io/nerdsofalltrades/micro-typescript-jest-prettier-boilerplate.svg)](https://greenkeeper.io/)
-=======
 [![CircleCI](https://circleci.com/gh/nerdsofalltrades/micro-typescript-jest-prettier-boilerplate.svg?style=svg)](https://circleci.com/gh/nerdsofalltrades/micro-typescript-jest-prettier-boilerplate)
 [![Greenkeeper badge](https://badges.greenkeeper.io/nerdsofalltrades/micro-typescript-jest-prettier-boilerplate.svg)](https://greenkeeper.io/)
->>>>>>> Stashed changes
 
 A boilerplate for building microservices with Micro, Typescript and Jest.