Improve CLI by a lot
Fine, 1.3.1 it is
Merge branch 'master' into rc/switch-to-cobra-cli

Conflicts:
	Godeps/Godeps.json
	nsq_provider.go
Merge pull request #3 from movableink/rc/switch-to-cobra-cli

Improve CLI by a lot