Merge travis changes into pezmc/master

Ensure my master branch is inline with the (rebased!?) travis-cleaned branch