change install targets to be explicit in setup.py
revert accidental changes to demo1