removed some stuff
changed default format
Merge branch 'master' of https://github.com/UndeadMastodon/Smuxi-Now-Playing

Conflicts:
	np.py