Merge branch 'master' of github.com:spf13/pandora

Conflicts:
	commands/pandora.go
Merge branch 'master' of github.com:spf13/pandora