Add dependency on cl-markup for the demo
Add some imports/exports, fix setup macro
Import stuff from the hermetic demo app to this one