Jmrunge/travis

Finally made Travis pass all tests