diff --git a/.travix.yml b/.travis.yml
similarity index 69%
rename from .travix.yml
rename to .travis.yml
index 19ba488..b7c9d39 100644
--- a/.travix.yml
+++ b/.travis.yml
@@ -6,6 +6,6 @@ matrix:
       env: TOXENV=lint
     - python: "3.5"
       env: TOXENV=lint
-install: pip install -U tox
+install: pip install pylint gitpython
 language: python
-script: tox
\ No newline at end of file
+script: pylint configurator.py
\ No newline at end of file
diff --git a/README.md b/README.md
index 553ca97..b1aa03e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # HASS Configurator
+[![Build Status](https://travis-ci.org/danielperna84/hass-configurator.svg?branch=master)](https://travis-ci.org/danielperna84/hass-configurator)
 ### Configuration UI for Home Assistant
 
 Since there currently is no nice way to edit the yaml-files HASS is using through the HASS frontend, I've code-snippet-patchworked this small webapp. It's essentially an embedded [Ace editor](https://ace.c9.io/), which has syntax hightlighting for yaml (and a ton of other features you can turn on and off). Of course there's also an integrated file browser to select whatever file you want to edit. When you're done with editing the file, click the save-button and it will replace the original.  
diff --git a/configurator.py b/configurator.py
index 9e3e3fe..4331fc4 100755
--- a/configurator.py
+++ b/configurator.py
@@ -2786,8 +2786,8 @@ def check_access(clientip):
     return False
 
 class RequestHandler(BaseHTTPRequestHandler):
-    def log_message(self, fmt, *args):
-        LOG.info("%s - %s" % (self.client_address[0], fmt % args))
+    def log_message(self, format, *args):
+        LOG.info("%s - %s" % (self.client_address[0], format % args))
         return
 
     def do_BLOCK(self):
diff --git a/pylintrc b/pylintrc
index e9291b3..5c85bc9 100644
--- a/pylintrc
+++ b/pylintrc
@@ -18,4 +18,6 @@ disable=
   line-too-long,
   unnecessary-pass,
   anomalous-backslash-in-string,
-  redefined-variable-type,
\ No newline at end of file
+  redefined-variable-type,
+  redefined-builtin,
+  no-else-return,
\ No newline at end of file