Fix formatter to match gofmt

Added GO tests from the GO repository here: https://code.google.com/p/go/source/browse/#hg%2Fsrc%2Fcmd%2Fgofmt%2Ftestdata