Merge pull request #526 from jessevondoom/master

some stuff #ciskip
Merge pull request #527 from jessevondoom/master

left the placeholder text off the new email collection form. duh.
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