Just had a quick port of his example to Go.
https://bitbucket.org/pkg/passwd/src/27f970fbcc05c0c6c258600...
Anyone fancy taking a look to see if I understood correctly?
EDIT: Specifically, should the PBKDF2 "key", not be used for something (like HMAC) rather than being used as the hash itself?