Changed definitions of match and replace from fun to primrec (not all are done)
Changed definitions of match and replace from fun to primrec (not all are done)

goodlyrottenapple/calculus-toolbox,goodlyrottenapple/calculus-toolbox,goodlyrottenapple/calculus-toolbox