Merge remote-tracking branch 'upstream/master' into merge-upstream

Conflicts:
	Gemfile.lock
fix ruby version, 2.1.1
Merge pull request #4 from Shopify/merge-upstream

Merge upstream
Sum up any labels called `/\d+ points?/`.