Hayley's final changes + cleanup

This commit is simply migrating all of the updates from Hayley's github
to mine. This will also get rid of unnecessary files for Digital Signage
branch.