Merge branch 'master' into with-sound
Adjusted muzak sound level and minor text edit

Small edits to one of the hope texts. Muzak plays throughout but at a
low volume.
removed unnecessary commented out code
Merge branch 'with-sound'