Updating shoehorn
Updating
Merge branch 'master' of github.com:cajun/shoehorn

Conflicts:
	command/command.go