Fix nolint issues

[theunrepentantgeek]

Looks like we were not following the rules for how //nolint comments work, and a recent update to the linter means these now break the build.

I think the relevant PR is this one.

For reference:

• The comment must start with //nolint (no space)
• To suppress a specific linter, use a colon - //nolint:gosec
• To provide additional information, follow it with another comment -
  //nolint:gosec // don't need cryptographic random numbers

[coveralls]

Coverage increased (+19.2%) to 73.092% when pulling 174a937 on fix/lint-issues into 1c684b6 on master.