Merge pull request #371 from knrc/master

Place demo assembly into its own module; SRAMP-261
Fix distro for new demo assembly; SRAMP-261