Updates to demos and other distro assets based on testing for M3
release.
Merge pull request #15 from EricWittmann/sramp-distro-m3-democleanup

Updates to demos and other distro assets based on testing for M3