Adding demos for npcdist/npudist, updating makfiles