Updated master branch travis config to test against master and 3.1 cores.