Merge branch 'master' of github.com:luozhihua/grunt-contrib-commands

Conflicts:
	test/command_test.js
zs
s
Merge remote-tracking branch 'remotes/git.luozhihua.com/master'

Conflicts:
	test/command_test.js