Add --no-automounter option
Document the automount option for the config file
Merge branch 'no-automounter'