Tweaks needed to be able to build against go 1.1
Merge pull request #1 from lachiehol/patch-1

Tweaks needed to be able to build against go 1.1