Replace Ruby 2.1.1 with 2.1.2
Updated gems
Enable simplecov
Merge branch 'displays' of github.com:tolien/data-tracker into displays

Conflicts:
	Gemfile.lock