Fix another dangling sirjtaa
Run gofmt on all files
Merge pull request #5 from ChimeraCoder/fix_installation_upstream

Fix installation upstream, and run gofmt