misc: small fix or general refactoring i did not bother commenting

Author: evilsocket

README.md

@@ -3,7 +3,8 @@
   <p align="center">
     <a href="https://github.com/bettercap/bettercap/releases/latest"><img alt="Release" src="https://img.shields.io/github/release/bettercap/bettercap.svg?style=flat-square"></a>
     <a href="https://github.com/bettercap/bettercap/blob/master/LICENSE.md"><img alt="Software License" src="https://img.shields.io/badge/license-GPL3-brightgreen.svg?style=flat-square"></a>
-    <a href="https://travis-ci.com/bettercap/bettercap"><img alt="Travis" src="https://travis-ci.com/bettercap/bettercap.svg?branch=master"></a>
+    <a href="https://travis-ci.org/bettercap/bettercap"><img alt="Travis" src="https://img.shields.io/travis/bettercap/bettercap/master.svg?style=flat-square"></a>
+
   </p>
 </p>