Making go lint happy
Merge branch 'master' into heroku