.gitignore: Add .Rhistory and .RData
Merge branch 'devel' into scantwoperm