Improve code style.
Improve code style.

Fix comment for File and Package types (they were likely renamed, but comment was not updated).

Do not use a named return variable in `Marshal`. Its name is `err`, which is not helpful. See https://github.com/golang/go/wiki/CodeReviewComments#named-result-parameters for motivation.
kardianos/govendor,kardianos/vendor