demo README updates
Move contrib/demo directory into contrib/demo-multi
Import current version of demo in contrib/demo