local linear + categorical differences
Merge branch 'master' into npRmpi