Embarassing typo is embarassing
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/sauce/heroku/cli.rb