Timeout the mount operation
Merge branch 'master' of github.com:profplump/UberZach-Video
Better resolve ambiguous matches