Rearranging, adding travis info