Resolve merge conflicts

.gitignore

@@ -1,2 +1,3 @@
 /node_modules/
 npm-debug.log
+/coverage/

.travis.yml

@@ -1,5 +1,8 @@
 language: node_js
-script: "make"
+script: 
+ - npm install -g codeclimate-test-reporter
+ - make cover
+ - CODECLIMATE_REPO_TOKEN=d3aad610220b6eaf4f51e38393c1b62586b1d68b898b42e418d9c2a8e0a7cb0d codeclimate < coverage/lcov.info
 node_js:
   - '0.10'
 branches:

Makefile

@@ -4,7 +4,11 @@ TEST_FILES := test/support.js $(shell find test/specs -type f -name "*.js")
 VERSION := $(shell node -e "console.log(require('./package.json').version)")
 
 # Our 'phony' make targets (don't involve any file changes)
-.PHONY: test bdd lint release
+.PHONY: cover test bdd lint release
+
+# Run Mocha, with coverage.
+cover:
+	@$(BIN)/istanbul cover $(BIN)/_mocha $(TEST_FILES) --report lcovonly -- -R spec
 
 # Run Mocha, with standard reporter.
 test:

README.markdown

@@ -16,7 +16,7 @@ Want to use Golang to power your robots? Check out our sister project,
 
 ## Build Status:
 
-[![Build Status](https://secure.travis-ci.org/hybridgroup/cylon.png?branch=master)](http://travis-ci.org/hybridgroup/cylon)
+[![Build Status](https://secure.travis-ci.org/hybridgroup/cylon.png?branch=master)](http://travis-ci.org/hybridgroup/cylon) [![Code Climate](https://codeclimate.com/github/hybridgroup/cylon/coverage.png)](https://codeclimate.com/github/hybridgroup/cylon)
 
 ## Examples