Fix linting

So linting was broken for a while. I fixed it, and also fixed all the linter problems. Now Travis will actually run lint checks.