Clean some crap up and get the travis build working (hopefully)