Merge pull request #501 from jeremygray/master

DOC: add note about how to disable auto-update; closes #493