left the placeholder text off the new email collection form. duh.
Merge pull request #527 from jessevondoom/master

left the placeholder text off the new email collection form. duh.
minor nudge to cashmusic.js (set scrollbars to no for embed iframes)
Merge pull request #528 from jessevondoom/master

minor nudge to cashmusic.js (set scrollbars to no for embed iframes)
Merge pull request #2 from cashmusic/master

whatever
wokring social feed backend stuff
Merge pull request #529 from jessevondoom/master

working social feeds on the backend at least...
css override in embeds + minor bugfixes
Merge pull request #533 from jessevondoom/master

css override in embeds + minor bugfixes
Upstream Merge