MF changes to plot.assoc.R and plot.assoc.Rd

Ah, or maybe you didn't rebase your MF-work branch on top of my master branch. Try doing `git rebase master` and fixing the conflict.

The morale is that it's always better to work only with files from the git tree, rather than from an external source like a ZIP file (even when it comes from git). That way you avoid accidentally copying changes from other commits.