Added codeclimate gem to repo
Changed coverage framework from codeclimate gem to simplecov
Merge branch 'v2.1.1'

Conflicts:
	Gemfile
	spec/spec_helper.rb