fixed issue of never heard of for many commands
Merge remote-tracking branch 'heroku/master'

Conflicts:
	scripts/keys.coffee