Adding my latest work for posterity
Merge branch 'spotify-web-demo'
Merge pull request #10 from oneteam-onedream/spotify-web-demo

Spotify web demo - merging this in since it won't affect production. Gemfile updates will be fine.
Merge remote-tracking branch 'upstream/master'