moved the call to bump and remove songs to inside the local player checks
Merge branch 'master' into bump_song_fix

Conflicts:
	SoundStream/src/com/lastcrusade/soundstream/service/PlaylistService.java
Merge pull request #208 from ejohnson44/bump_song_fix

bump song guest fix