Updated master branch travis config to test against master and 3.1 cores.
Merge pull request #94 from camfindlay/master

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