richfitz Merge pull request #101 from mrc-ide/fix-lint