Various Fixes

Let's do tabs => spaces, and add a better travis.yml for later.