Hotfix typo (regression bug from latest merge)
Add --no-automounter option
Document the automount option for the config file
Merge branch 'no-automounter'
Merge branch 'master' into autohide-tray

Conflicts:
	doc/udiskie.8.txt
Update documentation for 'tray' config item