Fix "gvm cross" for Go 1.4

> go tool dist: opendir /home/user/.gvm/gos/go1.4/src/pkg/runtime: No such file or directory
> ERROR: Couldn't compile runtime library for darwin amd64

I also took the liberty of including a second commit which fixes some whitespace inconsistencies in the same file (but I'm happy to remove/separate that commit if preferred).