Testing travis-ci

Don't pull this in yet