From Yehuda Katz: "When developing a gem, use the gemspec method in your Gemfile to avoid duplication. In general, a gem’s Gemfile should contain the Rubygems source and a single gemspec line. Do not check your Gemfile.lock into version control, since it enforces precision that does not exist in the gem command, which is used to install gems in practice. Even if the precision could be enforced, you wouldn’t want it, since it would prevent people from using your library with versions of its dependencies that are different from the ones you used to develop the gem."
Considering cancelled status as reject too
Bump up version to v0.1.5
Removing the dependency of builder >= 3.2.2
Bump up to version v0.1.6
Merge branch 'master' into ruby-2

Conflicts:
	Gemfile.lock
	clearsale.gemspec
Fix merge with master
Merge branch 'ruby-2' of github.com:Baby-com-br/clearsale into ruby-2