Prep to transfer code over to vm-test-svr-2

This commit has some changes ready to be tested with the Pi for digital
signage as soon as it gets placed onto the Windows VM