tweak to demo, sim fix
Merge branch 'master' of https://github.com/JeremyRubin/MAST
merging