This fixes builds in travis. I specifically didn't change pylintrc yet in this branch, to avoid having to fix all the new errors. But I did make some of those lint fixes anyway.
