Merge pull request #268 from Shopify/better_rake

Improve Rakefile
Conflicts:
	Rakefile