Add some settings that might be used as part of RdioPlayer.
Merge branch 'master' of github.com:peterlindkvist/allplay
Merge branch 'master' of github.com:peterlindkvist/allplay
Add RdioPlayer! WOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO!! Woo.
Merge branch 'master' of github.com:peterlindkvist/allplay

Conflicts:
	app/assets/javascripts/PlayerFactory.js