cleaned up
Merge remote-tracking branch 'upstream/master'

Conflicts:
	spot
Improved the play command. Now supports parameters playlist-by-index and playlist-by-name