Merge pull request #19 from exfm/maj-dev

Maj dev
Merge pull request #20 from exfm/maj-dev

Maj dev
Merge pull request #21 from exfm/maj-dev

Maj dev
Merge pull request #22 from exfm/maj-dev

twerkin' miniplayer
service icons for main song work now
Merge pull request #23 from exfm/maj-dev

Maj dev
cleansite needed for later
Merge branch 'dev' into dan-dev
Merge branch 'maj-dev' into dan-dev
status message hooked up to services now
added current song link
Merge pull request #24 from exfm/dan-dev

Dan dev