Feature/travis test

This will definitely break travis

Don't merge