Fix paths for guesspkg
Add a test for setting Exec.Type
Merge branch 'master' into osx