Updates for travis-ci to work..hopefully