#16: setup.sh no longer puts weird things into source dir
Merge master