Support versions of Go that lack the 'encoding' package.
Remove outdated comment.
Merge branch 'master' of github.com:BurntSushi/toml